Changeset 18879 in josm

Timestamp:

2023-10-25T15:23:52+02:00 (14 months ago)

Author:

taylor.smock

Message:

See #23125: Add secret to GH action environment

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (1 diff)
• native/macosx/macos-jpackage.sh (modified) (2 diffs)

trunk/.github/workflows/ant.yml

@@ -141 +141 @@
           CERT_MACOS_PW: ${{ secrets.CERT_MACOS_PW }}
           APPLE_ID_PW: ${{ secrets.APPLE_ID_PW }}
+          APPLE_ID_TEAM: ${{ secrets.APPLE_ID_TEAM }}
         run: |
           if [ ! -f tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip ]; then

trunk/native/macosx/macos-jpackage.sh

@@ -25 +25 @@
 mkdir app
 
-if [ -z "$CERT_MACOS_P12" ] || [ -z "$CERT_MACOS_PW" ] || [ -z "$APPLE_ID_PW" ]
+if [ -z "$CERT_MACOS_P12" ] || [ -z "$CERT_MACOS_PW" ] || [ -z "$APPLE_ID_PW" ] || [ -z "$APPLE_ID_TEAM" ]
 then
-    echo "CERT_MACOS_P12, CERT_MACOS_PW and APPLE_ID_PW are not set in the environment."
+    echo "CERT_MACOS_P12, CERT_MACOS_PW, APPLE_ID_PW, or APPLE_ID_TEAM are not set in the environment."
     echo "A JOSM.app will be created but not signed nor notarized."
     SIGNAPP=false
@@ -55 +55 @@
 
 echo "Building and signing app"
+# We specifically need the options to not be quoted -- we _want_ the word splitting.
+# shellcheck disable=SC2086
 jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \