ci: team id for notarization

variar · Nov 15, 2024 · 239e52a · 239e52a
1 parent b060456
commit 239e52a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/actions/agent-package-mac/action.yml b/.github/actions/agent-package-mac/action.yml
@@ -5,9 +5,11 @@ inputs:
     required: true
   p12-password:
     required: true
-  appstore-connect-username:
+  notarization-username:
     required: true
-  appstore-connect-password:
+  notarization-team:
+    required: true
+  notarization-password:
     required: true
 
 runs:
@@ -91,7 +93,7 @@ runs:
       if: ${{ github.event_name != 'pull_request' }} 
       shell: sh
       run: |
-        xcrun notarytool submit --wait --apple-id "${{ inputs.appstore-connect-username }}" --password "${{ inputs.appstore-connect-password }}" "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
+        xcrun notarytool submit --wait --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
 
     - name: Mac staple DMG 
       if: ${{ github.event_name != 'pull_request' }} 
@@ -103,7 +105,7 @@ runs:
       if: ${{ github.event_name != 'pull_request' }} 
       shell: sh
       run: |
-        xcrun notarytool submit  --wait --apple-id "${{ inputs.appstore-connect-username }}" --password "${{ inputs.appstore-connect-password }}" "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
+        xcrun notarytool submit  --wait --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
 
     - name: Mac staple PKG 
       if: ${{ github.event_name != 'pull_request' }} 

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -190,8 +190,9 @@ jobs:
         with:
           p12-file-base64: ${{ secrets.CODESIGN_BASE64 }}
           p12-password: ${{ secrets.CODESIGN_PASSWORD }}
-          appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
-          appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
+          notarization-username: ${{ secrets.NOTARIZATION_USERNAME }}
+          notarization-team: ${{ secrets.NOTARIZATION_TEAM }}
+          notarization-password: ${{ secrets.NOTARIZATION_PASSWORD }}
 
       - uses: actions/upload-artifact@v3
         with: