Fix yml issues

iron-fish · Oct 24, 2023 · 06f1a18 · 06f1a18
1 parent e6501a8
commit 06f1a18
Showing 1 changed file with 63 additions and 62 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,7 +26,64 @@ jobs:
   #     run: yarn build
 
   publish_on_mac_arm64:
-      runs-on: [self-hosted, macOS, ARM64]
+    runs-on: [self-hosted, macOS, ARM64]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18.13
+    - name: Install dependencies
+      run: yarn
+    - name: Setup code signing
+      env:
+        APPLE_IFLABS_SIGNING_CERT: ${{ secrets.APPLE_IFLABS_SIGNING_CERT }}
+        APPLE_IFLABS_SIGNING_CERT_PASSWORD: ${{ secrets.APPLE_IFLABS_SIGNING_CERT_PASSWORD }}
+        APPLE_PROVISIONING_PROFILE: ${{ secrets.APPLE_PROVISIONING_PROFILE }}
+        APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
+      run: |
+        # create variables
+        CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+        PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+        KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+        API_KEY_PATH=$RUNNER_TEMP/api_key.p8
+
+        # import certificate and provisioning profile from secrets
+        echo -n "$APPLE_IFLABS_SIGNING_CERT" | base64 --decode -o $CERTIFICATE_PATH
+        echo -n "$APPLE_PROVISIONING_PROFILE" | base64 --decode -o $PP_PATH
+        echo -n "$APPLE_API_KEY" | base64 --decode -o $API_KEY_PATH
+
+        # create temporary keychain
+        security create-keychain -p "$APPLE_IFLABS_SIGNING_CERT_PASSWORD" $KEYCHAIN_PATH
+        security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+        security unlock-keychain -p "$APPLE_IFLABS_SIGNING_CERT_PASSWORD" $KEYCHAIN_PATH
+
+        # import certificate to keychain
+        security import $CERTIFICATE_PATH -P "$APPLE_IFLABS_SIGNING_CERT_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+        security list-keychain -d user -s $KEYCHAIN_PATH
+
+        # apply provisioning profile
+        mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+        cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+        ls $RUNNER_TEMP
+    - name: Build and publish release
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        APPLE_ID: ${{ secrets.APPLE_ID }}
+        APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+      run: yarn build
+    - name: Upload latest-mac-arm64.yml
+      uses: actions/upload-artifact@v3
+      with:
+        name: latest-mac-arm64.yml
+        path: dist/latest-mac.yml
+
+    - name: Clean up keychain and provisioning profile
+      if: ${{ always() }}
+      run: |
+        security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+
+  publish_on_mac:
+      runs-on: macos-latest
       steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
@@ -71,75 +128,18 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
         run: yarn build
-      - name: Upload latest-mac-arm64.yml
+
+      - name: Upload latest-mac-x64.yml
         uses: actions/upload-artifact@v3
         with:
-          name: latest-mac-arm64.yml
+          name: latest-mac-x64.yml
           path: dist/latest-mac.yml
 
       - name: Clean up keychain and provisioning profile
         if: ${{ always() }}
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-
-    publish_on_mac:
-        runs-on: macos-latest
-        steps:
-        - uses: actions/checkout@v4
-        - uses: actions/setup-node@v3
-          with:
-            node-version: 18.13
-        - name: Install dependencies
-          run: yarn
-        - name: Setup code signing
-          env:
-            APPLE_IFLABS_SIGNING_CERT: ${{ secrets.APPLE_IFLABS_SIGNING_CERT }}
-            APPLE_IFLABS_SIGNING_CERT_PASSWORD: ${{ secrets.APPLE_IFLABS_SIGNING_CERT_PASSWORD }}
-            APPLE_PROVISIONING_PROFILE: ${{ secrets.APPLE_PROVISIONING_PROFILE }}
-            APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
-          run: |
-            # create variables
-            CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-            PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
-            KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-            API_KEY_PATH=$RUNNER_TEMP/api_key.p8
-
-            # import certificate and provisioning profile from secrets
-            echo -n "$APPLE_IFLABS_SIGNING_CERT" | base64 --decode -o $CERTIFICATE_PATH
-            echo -n "$APPLE_PROVISIONING_PROFILE" | base64 --decode -o $PP_PATH
-            echo -n "$APPLE_API_KEY" | base64 --decode -o $API_KEY_PATH
-
-            # create temporary keychain
-            security create-keychain -p "$APPLE_IFLABS_SIGNING_CERT_PASSWORD" $KEYCHAIN_PATH
-            security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-            security unlock-keychain -p "$APPLE_IFLABS_SIGNING_CERT_PASSWORD" $KEYCHAIN_PATH
-
-            # import certificate to keychain
-            security import $CERTIFICATE_PATH -P "$APPLE_IFLABS_SIGNING_CERT_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-            security list-keychain -d user -s $KEYCHAIN_PATH
-
-            # apply provisioning profile
-            mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-            cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-            ls $RUNNER_TEMP
-        - name: Build and publish release
-          env:
-            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            APPLE_ID: ${{ secrets.APPLE_ID }}
-            APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-          run: yarn build
-
-        - name: Upload latest-mac-x64.yml
-          uses: actions/upload-artifact@v3
-          with:
-            name: latest-mac-x64.yml
-            path: dist/latest-mac.yml
-
-        - name: Clean up keychain and provisioning profile
-          if: ${{ always() }}
-          run: |
-            security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-
+  
   update_mac_yml:
     needs: [publish_on_mac, publish_on_mac_arm64]
     runs-on: ubuntu-latest
@@ -172,6 +172,7 @@ jobs:
       - name: Delete old latest-mac.yml
         uses: mknejp/delete-release-assets@v1
         with:
+          token: ${{ github.token }}
           tag: v${{ steps.package-version.outputs.current-version }}
           assets: latest-mac.yml