apple certificate

yinyajiang · Feb 2, 2024 · 49c69db · 49c69db
1 parent a9fa32a
commit 49c69db
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -239,39 +239,42 @@ jobs:
       # NB: Building universal2 does not work with python from actions/setup-python
       - name: Install Requirements
         run: |
-          echo ${{ secrets.MAC_DEVELOP }}
           brew install coreutils
           python3 -m pip install -U --user pip setuptools wheel
           # We need to ignore wheels otherwise we break universal2 builds
           python3 -m pip install -U --user --no-binary :all: Pyinstaller -r requirements.txt
       - name: Install Certificate
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+        if: env.APPLE_CERTIFICATE != ''
         run: |
-          if [ "${{ secrets.MAC_DEVELOP }}" ]; then
             echo "Import apple devilop apple_certificate: start"
-            echo "${{ secrets.MAC_DEVELOP }}" > apple_certificate.p12.enc
-            openssl aes-256-cbc -k "${{ secrets.MAC_DEVELOP_DE_KEY }}" -in apple_certificate.p12.enc -out apple_certificate.p12 -d -a
+            echo "${{ secrets.APPLE_CERTIFICATE }}" > apple_certificate.p12.enc
+            openssl aes-256-cbc -k "${{ secrets.APPLE_CERTIFICATE_DECODE_KEY }}" -in apple_certificate.p12.enc -out apple_certificate.p12 -d -a
             security create-keychain -p "" build.keychain
-            security import apple_certificate.p12 -k ~/Library/Keychains/build.keychain -P "${{ secrets.MAC_DEVELOP_IMP_KEY }}" -A 
+            security import apple_certificate.p12 -k ~/Library/Keychains/build.keychain -P "${{ secrets.APPLE_CERTIFICATE_IMPORT_KEY }}" -A 
             security default-keychain -s ~/Library/Keychains/build.keychain
             echo "Import apple devilop apple_certificate: success"
-          fi
       - name: Prepare
         run: |
           python3 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
           python3 devscripts/make_lazy_extractors.py
+      - name: Build With Certificate
+        env:
+          APPLE_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }}
+        if: env.APPLE_CERTIFICATE_NAME != ''
+        run: |
+          python3 pyinst.py --target-architecture universal2 --onedir -n yt-dlp --codesign-identity "${{ secrets.APPLE_CERTIFICATE_NAME }}"
+          (cd ./dist/yt-dlp && zip -r ../yt-dlp_macos.zip .)
+          python3 pyinst.py --target-architecture universal2 --codesign-identity "${{ secrets.APPLE_CERTIFICATE_NAME }}"
       - name: Build
+        env:
+          APPLE_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }}
+        if: env.APPLE_CERTIFICATE_NAME == ''
         run: |
-          if [ -z "${MAC_DEVELOP_NAME}" ]; then
-            echo "not found MAC_DEVELOP_NAME" 
-            python3 pyinst.py --target-architecture universal2 --onedir -n yt-dlp
-            (cd ./dist/yt-dlp && zip -r ../yt-dlp_macos.zip .)
-            python3 pyinst.py --target-architecture universal2 
-          else
-            python3 pyinst.py --target-architecture universal2 --onedir -n yt-dlp --codesign-identity "${MAC_DEVELOP_NAME}"
-            (cd ./dist/yt-dlp && zip -r ../yt-dlp_macos.zip .)
-            python3 pyinst.py --target-architecture universal2 --codesign-identity "${MAC_DEVELOP_NAME}"
-          fi
-
+          python3 pyinst.py --target-architecture universal2 --onedir -n yt-dlp
+          (cd ./dist/yt-dlp && zip -r ../yt-dlp_macos.zip .)
+          python3 pyinst.py --target-architecture universal2 
       - name: Verify --update-to
         if: vars.UPDATE_TO_VERIFICATION
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -236,6 +236,10 @@ jobs:
       packages: write # For package cache
     secrets:
       GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+      APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+      APPLE_CERTIFICATE_DECODE_KEY: ${{ secrets.APPLE_CERTIFICATE_DECODE_KEY }}
+      APPLE_CERTIFICATE_IMPORT_KEY: ${{ secrets.APPLE_CERTIFICATE_IMPORT_KEY }}
+      APPLE_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }}
 
   publish_pypi:
     needs: [prepare, build]
@@ -255,7 +259,6 @@ jobs:
           sudo apt -y install pandoc man
           python -m pip install -U pip setuptools wheel twine
           python -m pip install -U -r requirements.txt
-
       - name: Prepare
         env:
           version: ${{ needs.prepare.outputs.version }}