File tree Expand file tree Collapse file tree 2 files changed +12
-5
lines changed
Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -130,7 +130,7 @@ jobs:
130130 - macos-14
131131 - macos-15
132132 otp :
133- - 27.2-3
133+ - 27
134134
135135 runs-on : ${{ matrix.macos }}
136136
@@ -140,6 +140,8 @@ jobs:
140140 fetch-depth : 0
141141 ref : ${{ github.event.inputs.branch_or_tag }}
142142 - name : prepare
143+ env :
144+ OTP : ${{ matrix.otp }}
143145 run : |
144146 brew install curl zip unzip gnu-sed freetds erlang@$OTP
145147 echo "/usr/local/bin" >> $GITHUB_PATH
@@ -151,8 +153,8 @@ jobs:
151153 APPLE_TEAM_ID : ${{ secrets.APPLE_TEAM_ID }}
152154 APPLE_ID_PASSWORD : ${{ secrets.APPLE_ID_PASSWORD }}
153155 APPLE_DEVELOPER_IDENTITY : ${{ secrets.APPLE_DEVELOPER_IDENTITY }}
154- APPLE_DEVELOPER_ID_BUNDLE : ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE }}
155- APPLE_DEVELOPER_ID_BUNDLE_PASSWORD : ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE_PASSWORD }}
156+ APPLE_DEVELOPER_ID_BUNDLE : ${{ matrix.os == 'macos-14' && secrets.APPLE_DEVELOPER_ID_BUNDLE || secrets.APPLE_DEVELOPER_ID_BUNDLE_NEW }}
157+ APPLE_DEVELOPER_ID_BUNDLE_PASSWORD : ${{ matrix.os == 'macos-14' && secrets.APPLE_DEVELOPER_ID_BUNDLE_PASSWORD || secrets.APPLE_DEVELOPER_ID_BUNDLE_PASSWORD_NEW }}
156158 BUILD_WITHOUT_QUIC : 1
157159 run : |
158160 erl -eval 'erlang:display(erlang:system_info(system_version)),halt()'
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ if [[ "${APPLE_DEVELOPER_ID_BUNDLE:-0}" == 0 || "${APPLE_DEVELOPER_ID_BUNDLE_PAS
2323fi
2424
2525PKSC12_FILE=" $HOME /developer-id-application.p12"
26- base64 --decode > " ${PKSC12_FILE} " <<< " ${APPLE_DEVELOPER_ID_BUNDLE }"
26+ printf ' %s ' " ${APPLE_DEVELOPER_ID_BUNDLE} " | base64 --decode > " ${PKSC12_FILE} "
2727
2828KEYCHAIN=" emqtt-bench-$( date +%s) .keychain-db"
2929KEYCHAIN_PASSWORD=" $( openssl rand -base64 32) "
@@ -40,7 +40,12 @@ security set-keychain-settings "${KEYCHAIN}"
4040security unlock-keychain -p " ${KEYCHAIN_PASSWORD} " " ${KEYCHAIN} "
4141security import " ${PKSC12_FILE} " -P " ${APPLE_DEVELOPER_ID_BUNDLE_PASSWORD} " -t cert -f pkcs12 -k " ${KEYCHAIN} " -T /usr/bin/codesign
4242security set-key-partition-list -S " apple-tool:,apple:,codesign:" -s -k " ${KEYCHAIN_PASSWORD} " " ${KEYCHAIN} "
43- security verify-cert -k " ${KEYCHAIN} " -c " ${PKSC12_FILE} "
43+ if [ " $( sw_vers -productVersion | cut -d' .' -f1) " -ge 15 ]; then
44+ openssl pkcs12 -in " ${PKSC12_FILE} " -clcerts -nokeys -out certificate.crt --passin " pass:${APPLE_DEVELOPER_ID_BUNDLE_PASSWORD} "
45+ security verify-cert -k " ${KEYCHAIN} " -c certificate.crt
46+ else
47+ security verify-cert -k " ${KEYCHAIN} " -c " ${PKSC12_FILE} "
48+ fi
4449security find-identity -p codesigning " ${KEYCHAIN} "
4550
4651# add new keychain into the search path for codesign, otherwise the stuff does not work
You can’t perform that action at this time.
0 commit comments