Fix release packaging step

nhielost · Dec 8, 2023 · 101552f · 101552f
1 parent 0f5d3fd
commit 101552f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/actions/package-plugin/action.yaml b/.github/actions/package-plugin/action.yaml
@@ -24,6 +24,10 @@ inputs:
  description: 'Developer ID for installer package codesigning (macOS only)'
  required: false
  default: ''
+ codesignTeam:
+ description: 'Developer team for codesigning (macOS only)'
+ required: false
+ default: ''
  codesignUser:
  description: 'Apple ID username for notarization (macOS only)'
  required: false
@@ -50,6 +54,7 @@ runs:
  env:
  CODESIGN_IDENT: ${{ inputs.codesignIdent }}
  CODESIGN_IDENT_INSTALLER: ${{ inputs.installerIdent }}
+ CODESIGN_TEAM: ${{ inputs.codesignTeam }}
  CODESIGN_IDENT_USER: ${{ inputs.codesignUser }}
  CODESIGN_IDENT_PASS: ${{ inputs.codesignPass }}
  run: |

diff --git a/.github/actions/setup-macos-codesigning/action.yaml b/.github/actions/setup-macos-codesigning/action.yaml
@@ -59,7 +59,7 @@ runs:
  id: codesign
  env:
  MACOS_SIGNING_IDENTITY: ${{ inputs.codesignIdentity }}
- MACOS_SIGNING_IDENTITY_INSTALLER: ${{ inputs.installerIdentity}}
+ MACOS_SIGNING_IDENTITY_INSTALLER: ${{ inputs.installerIdentity }}
  MACOS_SIGNING_CERT: ${{ inputs.codesignCertificate }}
  MAOCS_SIGNING_CERT_PASSWORD: ${{ inputs.certificatePassword }}
  MACOS_KEYCHAIN_PASSWORD: ${{ inputs.keychainPassword }}
@@ -139,7 +139,6 @@ runs:
  - name: Notarization 🧑‍💼
  shell: zsh --no-rcs --errexit --pipefail {0}
  id: notarization
- if: ${{ fromJSON(steps.codesign.outputs.haveCodesignIdent) }}
  env:
  MACOS_NOTARIZATION_USERNAME: ${{ inputs.notarizationUser }}
  MACOS_NOTARIZATION_PASSWORD: ${{ inputs.notarizationPassword }}

diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
@@ -3,7 +3,7 @@ on:
  workflow_call:
 jobs:
  check-event:
- name: Check GitHub Event Data 📡
+ name: Check GitHub Event Data 🔎
  runs-on: ubuntu-22.04
  defaults:
  run:
@@ -29,7 +29,7 @@ jobs:
  case "${GITHUB_EVENT_NAME}" in
  pull_request)
  config_data=('codesign:false' 'notarize:false' 'package:false' 'config:RelWithDebInfo')
- if gh pr view --json labels \
+ if gh pr view ${{ github.event.number }} --json labels \
  | jq -e -r '.labels[] | select(.name == "Seeking Testers")' > /dev/null; then
  config_data[0]='codesign:true'
  config_data[2]='package:true'
@@ -81,9 +81,9 @@ jobs:
  if (( ${+RUNNER_DEBUG} )) setopt XTRACE
 
  print '::group::Clean Homebrew Environment'
- typeset -a to_remove=()
+ local -a to_remove=()
 
- if (( #to_remove > 0 )) brew uninstall --ignore-dependencies ${to_remove}
+ if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
  print '::endgroup::'
 
  local product_name
@@ -104,7 +104,7 @@ jobs:
 
  - name: Set Up Codesigning 🔑
  uses: ./.github/actions/setup-macos-codesigning
- if: ${{ fromJSON(needs.check-event.outputs.codesign) }}
+ if: fromJSON(needs.check-event.outputs.codesign)
  id: codesign
  with:
  codesignIdentity: ${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}
@@ -133,6 +133,7 @@ jobs:
  codesign: ${{ fromJSON(needs.check-event.outputs.codesign) && fromJSON(steps.codesign.outputs.haveCodesignIdent) }}
  codesignIdent: ${{ steps.codesign.outputs.codesignIdent }}
  installerIdent: ${{ steps.codesign.outputs.installerIdent }}
+ codesignTeam: ${{ steps.codesign.outputs.codesignTeam }}
  notarize: ${{ fromJSON(needs.check-event.outputs.notarize) && fromJSON(steps.codesign.outputs.haveNotarizationUser) }}
  codesignUser: ${{ secrets.MACOS_NOTARIZATION_USERNAME }}
  codesignPass: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}