Skip to content

Commit bc0938c

Browse files
authored
ci: macOS: replace deprecated tool by new simpler one
1 parent 74d5381 commit bc0938c

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

.github/workflows/make.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,20 +174,16 @@ jobs:
174174
'${TOOLCHAIN_PATH}/resources/macOS/dmg/contents'"
175175
eval "create-dmg $createDmgArgs" || eval "create-dmg $createDmgArgs" # We also retry just in case...
176176
177-
- name: "[macOS] Notarize DMG"
178-
if: runner.os == 'macOS'
179-
uses: adriweb/xcode-notarize-please@v1.1
180-
with:
181-
product-path: CEdev-${{runner.os}}.${{matrix.install-output-ext}}
182-
appstore-connect-username: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
183-
appstore-connect-password: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
184-
primary-bundle-id: 'com.adriweb.CEToolchain'
185-
186-
- name: "[macOS] Staple DMG"
187-
if: runner.os == 'macOS'
188-
uses: devbotsxyz/xcode-staple@v1.0.0
189-
with:
190-
product-path: CEdev-${{runner.os}}.${{matrix.install-output-ext}}
177+
- name: "[macOS] Notarize and staple DMG"
178+
if: runner.os == 'macOS' && github.repository == 'CE-Programming/toolchain' # don't run on forks, since they don't have secrets
179+
env:
180+
APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
181+
APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
182+
APPLE_NOTARIZATION_TEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAMID }}
183+
run: |
184+
xcrun notarytool store-credentials "notarytool-profile" --apple-id "$APPLE_NOTARIZATION_USERNAME" --team-id "$APPLE_NOTARIZATION_TEAMID" --password "$APPLE_NOTARIZATION_PASSWORD"
185+
xcrun notarytool submit "CEdev-${{runner.os}}.${{matrix.install-output-ext}}" --keychain-profile "notarytool-profile" --wait
186+
xcrun stapler staple "CEdev-${{runner.os}}.${{matrix.install-output-ext}}"
191187
192188
- name: "[Linux] Tar toolchain"
193189
if: runner.os == 'Linux'

0 commit comments

Comments
 (0)