Skip to content

Commit

Permalink
Add codesignTeam input to setup-macos-codesigning action
Browse files Browse the repository at this point in the history
  • Loading branch information
royshil committed Mar 28, 2024
1 parent 896b51d commit 13a143d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .github/actions/setup-macos-codesigning/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ inputs:
codesignIdentity:
description: Codesigning identity
required: true
codesignTeam:
description: Codesigning team
required: true
installerIdentity:
description: Codesigning identity for package installer
required: false
Expand Down Expand Up @@ -59,6 +62,7 @@ runs:
id: codesign
env:
MACOS_SIGNING_IDENTITY: ${{ inputs.codesignIdentity }}
MACOS_SIGNING_TEAM: ${{ inputs.codesignTeam }}
MACOS_SIGNING_IDENTITY_INSTALLER: ${{ inputs.installerIdentity}}
MACOS_SIGNING_CERT: ${{ inputs.codesignCertificate }}
MAOCS_SIGNING_CERT_PASSWORD: ${{ inputs.certificatePassword }}
Expand Down Expand Up @@ -92,12 +96,10 @@ runs:
security list-keychain -d user -s ${keychain_path} 'login-keychain'
print '::endgroup::'
local -r team_id="${${MACOS_SIGNING_IDENTITY##* }//(\(|\))/}"
print "codesignIdent=${MACOS_SIGNING_IDENTITY}" >> $GITHUB_OUTPUT
print "installerIdent=${MACOS_SIGNING_IDENTITY_INSTALLER}" >> $GITHUB_OUTPUT
print "MACOS_KEYCHAIN_PASSWORD=${MACOS_KEYCHAIN_PASSWORD}" >> $GITHUB_ENV
print "codesignTeam=${team_id}" >> $GITHUB_OUTPUT
print "codesignTeam=${MACOS_SIGNING_TEAM}" >> $GITHUB_OUTPUT
} else {
print 'haveCodesignIdent=false' >> $GITHUB_OUTPUT
}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jobs:
id: codesign
with:
codesignIdentity: ${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}
codesignTeam: ${{ secrets.MACOS_SIGNING_APPLICATION_TEAM }}
installerIdentity: ${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}
codesignCertificate: ${{ secrets.MACOS_SIGNING_CERT }}
certificatePassword: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
Expand Down

0 comments on commit 13a143d

Please sign in to comment.