Explorar el Código

setting keychain path via env didn't seem to work

Tobias Hagemann hace 3 años
padre
commit
90381ee53e
Se han modificado 1 ficheros con 3 adiciones y 5 borrados
  1. 3 5
      .github/workflows/build.yml

+ 3 - 5
.github/workflows/build.yml

@@ -402,7 +402,6 @@ jobs:
           VERSION_NO: ${{ needs.metadata.outputs.versionNum }}
       - name: Install notarization credentials
         env:
-          KEYCHAIN_PATH: ${{ env.RUNNER_TEMP }}/notarization.keychain-db
           NOTARIZATION_KEYCHAIN_PROFILE: ${{ secrets.MACOS_NOTARIZATION_KEYCHAIN_PROFILE }}
           NOTARIZATION_APPLE_ID: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
           NOTARIZATION_PW: ${{ secrets.MACOS_NOTARIZATION_PW }}
@@ -410,6 +409,7 @@ jobs:
           NOTARIZATION_TMP_KEYCHAIN_PW: ${{ secrets.MACOS_NOTARIZATION_TMP_KEYCHAIN_PW }}
         run: |
           # create temporary keychain
+          KEYCHAIN_PATH=$RUNNER_TEMP/notarization.keychain-db
           security create-keychain -p "${NOTARIZATION_TMP_KEYCHAIN_PW}" ${KEYCHAIN_PATH}
           security set-keychain-settings -lut 900 ${KEYCHAIN_PATH}
           security unlock-keychain -p "${NOTARIZATION_TMP_KEYCHAIN_PW}" ${KEYCHAIN_PATH}
@@ -419,17 +419,15 @@ jobs:
           xcrun notarytool store-credentials "${NOTARIZATION_KEYCHAIN_PROFILE}" --apple-id "${NOTARIZATION_APPLE_ID}" --password "${NOTARIZATION_PW}" --team-id "${NOTARIZATION_TEAM_ID}" --keychain "${KEYCHAIN_PATH}"
       - name: Notarize .dmg
         env:
-          KEYCHAIN_PATH: ${{ env.RUNNER_TEMP }}/notarization.keychain-db
           NOTARIZATION_KEYCHAIN_PROFILE: ${{ secrets.MACOS_NOTARIZATION_KEYCHAIN_PROFILE }}
         run: |
+          KEYCHAIN_PATH=$RUNNER_TEMP/notarization.keychain-db
           sudo xcode-select -s /Applications/Xcode_13.0.app
           xcrun notarytool submit Cryptomator-*.dmg --keychain-profile "${NOTARIZATION_KEYCHAIN_PROFILE}" --keychain "${KEYCHAIN_PATH}" --wait
           xcrun stapler staple Cryptomator-*.dmg
       - name: Clean up notarization credentials
         if: ${{ always() }}
-        env:
-          KEYCHAIN_PATH: ${{ env.RUNNER_TEMP }}/notarization.keychain-db
-        run: security delete-keychain ${KEYCHAIN_PATH}
+        run: security delete-keychain $RUNNER_TEMP/notarization.keychain-db
       - name: Upload mac-dmg
         uses: actions/upload-artifact@v2
         with: