Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit 13a143d

Browse files
committed
Add codesignTeam input to setup-macos-codesigning action
1 parent 896b51d commit 13a143d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/actions/setup-macos-codesigning/action.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ inputs:
44
codesignIdentity:
55
description: Codesigning identity
66
required: true
7+
codesignTeam:
8+
description: Codesigning team
9+
required: true
710
installerIdentity:
811
description: Codesigning identity for package installer
912
required: false
@@ -59,6 +62,7 @@ runs:
5962
id: codesign
6063
env:
6164
MACOS_SIGNING_IDENTITY: ${{ inputs.codesignIdentity }}
65+
MACOS_SIGNING_TEAM: ${{ inputs.codesignTeam }}
6266
MACOS_SIGNING_IDENTITY_INSTALLER: ${{ inputs.installerIdentity}}
6367
MACOS_SIGNING_CERT: ${{ inputs.codesignCertificate }}
6468
MAOCS_SIGNING_CERT_PASSWORD: ${{ inputs.certificatePassword }}
@@ -92,12 +96,10 @@ runs:
9296
security list-keychain -d user -s ${keychain_path} 'login-keychain'
9397
print '::endgroup::'
9498
95-
local -r team_id="${${MACOS_SIGNING_IDENTITY##* }//(\(|\))/}"
96-
9799
print "codesignIdent=${MACOS_SIGNING_IDENTITY}" >> $GITHUB_OUTPUT
98100
print "installerIdent=${MACOS_SIGNING_IDENTITY_INSTALLER}" >> $GITHUB_OUTPUT
99101
print "MACOS_KEYCHAIN_PASSWORD=${MACOS_KEYCHAIN_PASSWORD}" >> $GITHUB_ENV
100-
print "codesignTeam=${team_id}" >> $GITHUB_OUTPUT
102+
print "codesignTeam=${MACOS_SIGNING_TEAM}" >> $GITHUB_OUTPUT
101103
} else {
102104
print 'haveCodesignIdent=false' >> $GITHUB_OUTPUT
103105
}

.github/workflows/build-project.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
id: codesign
119119
with:
120120
codesignIdentity: ${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}
121+
codesignTeam: ${{ secrets.MACOS_SIGNING_APPLICATION_TEAM }}
121122
installerIdentity: ${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}
122123
codesignCertificate: ${{ secrets.MACOS_SIGNING_CERT }}
123124
certificatePassword: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}

0 commit comments

Comments
 (0)