diff --git a/.github/workflows/build-enjoy-app.yml b/.github/workflows/build-enjoy-app.yml index f41fa1ad..b41ee863 100644 --- a/.github/workflows/build-enjoy-app.yml +++ b/.github/workflows/build-enjoy-app.yml @@ -20,8 +20,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} - CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} + MACOS_CERTIFICATE_APPLICATION_BASE64: ${{ secrets.MACOS_CERTIFICATE_APPLICATION_BASE64 }} + MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }} run: yarn make:enjoy - if: matrix.os == 'macos-latest' name: Build macOS arm64 @@ -30,8 +30,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} - CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} + MACOS_CERTIFICATE_APPLICATION_BASE64: ${{ secrets.MACOS_CERTIFICATE_APPLICATION_BASE64 }} + MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }} PACKAGE_OS_ARCH: arm64 run: | ./enjoy/scripts/add-macos-cert.sh diff --git a/enjoy/scripts/add-macos-cert.sh b/enjoy/scripts/add-macos-cert.sh index b4b803f5..ffe72f37 100755 --- a/enjoy/scripts/add-macos-cert.sh +++ b/enjoy/scripts/add-macos-cert.sh @@ -4,7 +4,7 @@ KEY_CHAIN=build.keychain CERTIFICATE_P12=certificate.p12 # Recreate the certificate from the secure environment variable -echo $CERTIFICATE_OSX_APPLICATION | base64 --decode > $CERTIFICATE_P12 +echo $MACOS_CERTIFICATE_APPLICATION_BASE64 | base64 --decode > $CERTIFICATE_P12 #create a keychain security create-keychain -p actions $KEY_CHAIN @@ -15,7 +15,7 @@ security default-keychain -s $KEY_CHAIN # Unlock the keychain security unlock-keychain -p actions $KEY_CHAIN -security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $CERTIFICATE_PASSWORD -T /usr/bin/codesign; +security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $MACOS_CERTIFICATE_PASSWORD -T /usr/bin/codesign; security set-key-partition-list -S apple-tool:,apple: -s -k actions $KEY_CHAIN