mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-23 21:12:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix macos notarization

Browse Source
This commit is contained in:
Syer10
2023-12-02 12:30:35 -05:00
parent 5d2632c916
commit 15ce1f7cec
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/Build.yml vendored
View File

@@ -91,10 +91,10 @@ jobs:
arguments: > arguments: >
${{ matrix.build }} ${{ matrix.build }}
-Pcompose.desktop.mac.sign=true -Pcompose.desktop.mac.sign=true
-Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY_SHORT }} -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }}
-Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }} -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }}
-Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }} -Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }}
-Pidentity="${{ secrets.APPLE_IDENTITY }}" -Pcompose.desktop.mac.notarization.teamID=${{ secrets.APPLE_TEAM_ID }}
- name: Sign APK - name: Sign APK
uses: r0adkll/sign-android-release@v1 uses: r0adkll/sign-android-release@v1

4
.github/workflows/Preview.yml vendored
View File

@@ -97,10 +97,10 @@ jobs:
arguments: > arguments: >
${{ matrix.build }} ${{ matrix.build }}
-Pcompose.desktop.mac.sign=true -Pcompose.desktop.mac.sign=true
-Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY_SHORT }} -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }}
-Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }} -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }}
-Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }} -Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }}
-Pidentity="${{ secrets.APPLE_IDENTITY }}" -Pcompose.desktop.mac.notarization.teamID=${{ secrets.APPLE_TEAM_ID }}
-Ppreview="${{ env.COMMIT_COUNT }}" -Ppreview="${{ env.COMMIT_COUNT }}"
--stacktrace --stacktrace

2
buildSrc/src/main/kotlin/TachideskTasks.kt
View File

@@ -55,7 +55,7 @@ private fun Task.onlyIfSigning(project: Project) {
} }
} }
private fun Project.getSigningIdentity() = "${properties["identity"]}".trim('"') private fun Project.getSigningIdentity() = "${properties["compose.desktop.mac.signing.identity"].toString().trim('"')} (${properties["compose.desktop.mac.notarization.teamID"].toString().trim('"')})"
private fun isSigning(properties: Map<String, Any?>) = properties["compose.desktop.mac.sign"].toString() == "true" private fun isSigning(properties: Map<String, Any?>) = properties["compose.desktop.mac.sign"].toString() == "true"