[GHA] Better use secrets

And start remove debug splitting
gama-platform · Oct 5, 2021 · 1a5e810 · 1a5e810
1 parent 2252345
commit 1a5e810
Showing 1 changed file with 8 additions and 34 deletions.
diff --git a/.github/workflows/github-travis.yml b/.github/workflows/github-travis.yml
@@ -90,48 +90,22 @@ jobs:
 
       - name: Create Keychain
         env: 
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_APP-CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_APP-CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
           MACOS_KEYCHAIN_PWD: ${{ secrets.MACOS_KEYCHAIN_PWD }}
         run: |
+          # Prepare the keychain
           security create-keychain -p "$MACOS_KEYCHAIN_PWD" build.keychain
-
-      - name: Set keychain as default
-        env: 
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_APP-CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_APP-CERTIFICATE_PWD }}
-          MACOS_KEYCHAIN_PWD: ${{ secrets.MACOS_KEYCHAIN_PWD }}
-        run: |
           security default-keychain -s build.keychain
-
-      - name: Unlock the keychain
-        env: 
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_APP-CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_APP-CERTIFICATE_PWD }}
-          MACOS_KEYCHAIN_PWD: ${{ secrets.MACOS_KEYCHAIN_PWD }}
-        run: |
           security unlock-keychain -p "$MACOS_KEYCHAIN_PWD" build.keychain
-
-      - name: Import certificate file
-        env: 
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_APP-CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_APP-CERTIFICATE_PWD }}
-          MACOS_KEYCHAIN_PWD: ${{ secrets.MACOS_KEYCHAIN_PWD }}
-        run: |
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-
-      - name: Import certificate in the keychain
-        env: 
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_APP-CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_APP-CERTIFICATE_PWD }}
-          MACOS_KEYCHAIN_PWD: ${{ secrets.MACOS_KEYCHAIN_PWD }}
-        run: |
-          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          # Prepare certificate
+          echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
+          security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
 
       - name: Set key partition
         env: 
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_APP-CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_APP-CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
           MACOS_KEYCHAIN_PWD: ${{ secrets.MACOS_KEYCHAIN_PWD }}
         run: |
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_KEYCHAIN_PWD" build.keychain