CI mac: mv ensure step to environment.sh

handled earlier and not complicating the YAML

Author: MartinPulec

.github/scripts/environment.sh

@@ -164,8 +164,17 @@ set_ximea_url() {
 }
 set_ximea_url
 
-import_signing_key() {
-        if [ "$(uname -s)" != Darwin ] || [ -z "$apple_key_p12_b64" ]; then
+import_macos_signing_key() {
+        if [ "$(uname -s)" != Darwin ]; then
+                return 0
+        fi
+
+        if [ -z "$apple_key_p12_b64" ]; then
+                if [ "${GITHUB_REPOSITORY?}" = CESNET/UltraGrid ]; then
+                        echo "apple_key_p12_b64 GitHub secret must be set"\
+                         "in main repository (signing won't work without)"
+                        exit 1
+                fi
                 return 0
         fi
         # Inspired by https://www.update.rocks/blog/osx-signing-with-travis/
@@ -182,7 +191,7 @@ import_signing_key() {
         printf '%b' "KEY_CHAIN_PASS=$KEY_CHAIN_PASS\nKEY_CHAIN=$KEY_CHAIN\n" \
                 >> "$GITHUB_ENV"
 }
-import_signing_key
+import_macos_signing_key
 
 printf '%b' 'DELTA_MAC_ARCHIVE=videomaster-macos-dev.tar.gz\n' >> "$GITHUB_ENV"
 

.github/workflows/macos.yml

@@ -92,11 +92,6 @@ jobs:
     - name: sign+notarize
       if: env.KEY_CHAIN != null
       run: .github/scripts/macOS/sign.sh uv-qt.app
-    - name: ensure sign+notarize in main repo
-      if: env.KEY_CHAIN == null && github.repository == 'CESNET/UltraGrid'
-        && github.ref == 'refs/heads/master'
-      run: "echo 'UltraGrid must be signed but key (set by environment.sh)\
-         is missing && exit 1"
     - name: make dmg
       run: |
         for n in `seq 5`; do # do more attempts