Skip to content

Commit

Permalink
[ci skip] Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
infeo committed Dec 16, 2024
2 parents a32cdb2 + cbcdff1 commit e35e1b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ jobs:
working-directory: target
# ditto must be used, see https://developer.apple.com/documentation/xcode/packaging-mac-software-for-distribution#Build-a-zip-archive
- name: Zip binary for notarization
if: inputs.notarize
if: (startsWith(github.ref, 'refs/tags/') && github.event.action == 'published') || inputs.notarize
run: ditto -c -k --keepParent ./target/cryptomator-cli.app ./${{ matrix.artifact-name}}
- name: Setup Xcode
if: inputs.notarize
if: (startsWith(github.ref, 'refs/tags/') && github.event.action == 'published') || inputs.notarize
run: sudo xcode-select -s ${{ matrix.xcode-path}}
shell: bash
#would like to uses cocoalibs/xcode-notarization-action@v1, but blocked due to https://github.com/cocoalibs/xcode-notarization-action/issues/1
- name: Prepare Notarization Credentials
if: inputs.notarize
if: (startsWith(github.ref, 'refs/tags/') && github.event.action == 'published') || inputs.notarize
run: |
# create temporary keychain
KEYCHAIN_PATH=$RUNNER_TEMP/notarization.keychain-db
Expand All @@ -181,13 +181,13 @@ jobs:
xcrun notarytool store-credentials "notary" --apple-id "${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}" --password "${{ secrets.MACOS_NOTARIZATION_PW }}" --team-id "${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}" --keychain "${KEYCHAIN_PATH}"
shell: bash
- name: Notarize
if: inputs.notarize
if: (startsWith(github.ref, 'refs/tags/') && github.event.action == 'published') || inputs.notarize
run: |
KEYCHAIN_PATH=$RUNNER_TEMP/notarization.keychain-db
xcrun notarytool submit ${{ matrix.artifact-name }} --keychain-profile "notary" --keychain "${KEYCHAIN_PATH}" --wait
shell: bash
- name: Staple
if: inputs.notarize
if: (startsWith(github.ref, 'refs/tags/') && github.event.action == 'published') || inputs.notarize
run: xcrun stapler staple ./target/cryptomator-cli.app
shell: bash
- name: Cleanup
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>cli</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<name>Cryptomator CLI</name>
<description>Command line program to access encrypted files via WebDAV.</description>
<url>https://github.com/cryptomator/cli</url>
Expand Down

0 comments on commit e35e1b6

Please sign in to comment.