s/APPLE_SIGN_ID/APPLE_CERTIFICATE_ID/g

Author: timangus

.github/workflows/build.yml

@@ -220,9 +220,9 @@ jobs:
       env:
         APPLE_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_CERTIFICATE_P12_BASE64 }}
         APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+        APPLE_CERTIFICATE_ID: ${{ secrets.APPLE_CERTIFICATE_ID }}
         APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
         APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
-        APPLE_SIGN_ID: ${{ secrets.APPLE_SIGN_ID }}
         APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
     - uses: actions/upload-artifact@v4
       if: github.event_name != 'pull_request'

installers/macos/build.sh

@@ -91,12 +91,12 @@ macdeployqt ${PRODUCT_NAME}.app \
   -executable=${PRODUCT_NAME}.app/Contents/MacOS/CrashReporter \
   -executable=${PRODUCT_NAME}.app/Contents/MacOS/MessageBox \
   -executable=${PRODUCT_NAME}.app/Contents/MacOS/Updater \
-  -codesign="${APPLE_SIGN_ID}"
+  -codesign="${APPLE_CERTIFICATE_ID}"
 
 if [ -n "${SIGNING_ENABLED}" ]
 then
   echo "Signing..."
-  codesign --verbose --deep --force --options runtime --sign "${APPLE_SIGN_ID}" \
+  codesign --verbose --deep --force --options runtime --sign "${APPLE_CERTIFICATE_ID}" \
     ${PRODUCT_NAME}.app || exit $?
 
   cat <<EOF > QtWebEngineProcess.entitlements
@@ -111,12 +111,12 @@ then
 EOF
 
   echo "Signing QtWebEngine..."
-  codesign --verbose --force --options runtime --sign "${APPLE_SIGN_ID}" \
+  codesign --verbose --force --options runtime --sign "${APPLE_CERTIFICATE_ID}" \
     --entitlements QtWebEngineProcess.entitlements \
     ${PRODUCT_NAME}.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess || exit $?
 
   echo "Resigning main executable..."
-  codesign --verbose --force --options runtime --sign "${APPLE_SIGN_ID}" \
+  codesign --verbose --force --options runtime --sign "${APPLE_CERTIFICATE_ID}" \
     ${PRODUCT_NAME}.app/Contents/MacOS/${PRODUCT_NAME} || exit $?
 
   echo "Verifying..."