Skip to content

Commit 678e1a9

Browse files
committed
macOS: Move notarization inside gradle packaging
[skip ci]
1 parent 659b4e2 commit 678e1a9

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/release-gradle.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ jobs:
146146
ORG_GRADLE_PROJECT_revision: ${{ needs.version.outputs.revision }}
147147
ORG_GRADLE_PROJECT_compose.desktop.mac.sign: ${{ secrets.PROCESSING_SIGNING }}
148148
ORG_GRADLE_PROJECT_compose.desktop.mac.signing.identity: ${{ secrets.PROCESSING_SIGNING_IDENTITY }}
149+
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.appleID: ${{ secrets.PROCESSING_APPLE_ID }}
150+
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.password: ${{ secrets.PROCESSING_APP_PASSWORD }}
151+
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.teamID: ${{ secrets.PROCESSING_TEAM_ID }}
149152

150153
- name: Upload portables to release
151154
uses: svenstaro/upload-release-action@v2
@@ -160,11 +163,3 @@ jobs:
160163
repo_token: ${{ secrets.GITHUB_TOKEN }}
161164
asset_name: processing-${{ needs.version.outputs.version }}-${{ matrix.os_prefix }}-${{ matrix.arch }}.${{ matrix.extension }}
162165
file: app/build/compose/binaries/main/${{ matrix.binary }}.${{ matrix.extension }}
163-
164-
- name: Notarize DMG
165-
if: runner.os == 'macOS'
166-
run: ./gradlew notarizeDmg
167-
env:
168-
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.appleID: ${{ secrets.PROCESSING_APPLE_ID }}
169-
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.password: ${{ secrets.PROCESSING_APP_PASSWORD }}
170-
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.teamID: ${{ secrets.PROCESSING_TEAM_ID }}

app/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ afterEvaluate{
259259
actions = emptyList()
260260
}
261261
tasks.named("packageDistributionForCurrentOS").configure {
262+
if(compose.desktop.application.nativeDistributions.macOS.notarization.appleID.isPresent){
263+
dependsOn("notarizeDmg")
264+
}
262265
dependsOn("packageSnap")
263266
}
264267
}

0 commit comments

Comments
 (0)