Revert debugging changes

liquidaty · Dec 12, 2024 · 3c4358e · 3c4358e
1 parent ac77184
commit 3c4358e
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -753,18 +753,16 @@ jobs:
     - name: Install Developer Certificate
       env:
         MACOS_CERT_P12: ${{ secrets.MACOS_CERT_P12 }}
-        MACOS_CERT_PWD: ${{ secrets.MACOS_CERT_PASSWORD }}
+        MACOS_CERT_PASSWORD: ${{ secrets.MACOS_CERT_PASSWORD }}
       run: |
         echo "$MACOS_CERT_P12" | base64 --decode > cert.p12
         security create-keychain -p actions build.keychain
         security default-keychain -s build.keychain
         security unlock-keychain -p actions build.keychain
         security set-keychain-settings -t 3600 -u build.keychain
-        openssl version
-        CRT_PWD=$(echo "$MACOS_CERT_PWD" | tr -d '\n')
-        if ! security import cert.p12 -k build.keychain -P "$CRT_PWD" -A -t cert -f pkcs12 -T /usr/bin/codesign; then
-          openssl pkcs12 -in cert.p12 -nocerts -out "codesign.key" -nodes -passin pass:"$CRT_PWD"
-          openssl pkcs12 -in cert.p12 -clcerts -nokeys -out "codesign.crt" -passin pass:"$CRT_PWD"
+        if ! security import cert.p12 -k build.keychain -P "$MACOS_CERT_PASSWORD" -A -t cert -f pkcs12 -T /usr/bin/codesign; then
+          openssl pkcs12 -in cert.p12 -nocerts -out "codesign.key" -nodes -password pass:"$MACOS_CERT_PASSWORD"
+          openssl pkcs12 -in cert.p12 -clcerts -nokeys -out "codesign.crt" -password pass:"$MACOS_CERT_PASSWORD"
           ls -hl codesign.{key,crt}
           security import "codesign.key" -k build.keychain -P "" -A -T /usr/bin/codesign
           security import "codesign.crt" -k build.keychain -P "" -A -T /usr/bin/codesign