From 24dba50bd1464336026b122788484116da0723e8 Mon Sep 17 00:00:00 2001 From: Azeem Sajid Date: Thu, 12 Dec 2024 12:14:19 +0500 Subject: [PATCH] Run on both macos 13 and 14 --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bc20b7b..fea5f6d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -731,11 +731,12 @@ jobs: macos-codesign: strategy: matrix: - # os: [macos-13, macos-14] - os: [macos-13] + os: [macos-13, macos-14] + # os: [macos-13] runs-on: ${{ matrix.os }} timeout-minutes: 15 + continue-on-error: true steps: - name: Set up zsv+lib @@ -761,8 +762,8 @@ jobs: security set-keychain-settings -t 3600 -u build.keychain openssl version if ! security import cert.p12 -k build.keychain -P '${{ secrets.MACOS_CERT_PASSWORD }}' -A -T /usr/bin/codesign; then - openssl pkcs12 -in cert.p12 -nocerts -out "codesign.key" -nodes -passin pass:'${{ secrets.MACOS_CERT_PASSWORD }}' - openssl pkcs12 -in cert.p12 -clcerts -nokeys -out "codesign.crt" -passin pass:'${{ secrets.MACOS_CERT_PASSWORD }}' + openssl pkcs12 -in cert.p12 -nocerts -out "codesign.key" -nodes -password pass:'${{ secrets.MACOS_CERT_PASSWORD }}' + openssl pkcs12 -in cert.p12 -clcerts -nokeys -out "codesign.crt" -password pass:'${{ secrets.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