From 612ef65726fc8b3a6c0ac46abb2d2579069b00e6 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Thu, 12 Sep 2024 14:24:20 +0200 Subject: [PATCH] CI: Set default values for have* outputs in macos-codesigning action The "provisioning" and "notarization" steps that set the "haveProvisioningProfile" and "haveNotarizationUser" outputs respectively only run if "haveCodesignIdent" has evaluated to true in the prior "codesign" step. This means that if "haveCodesignIdent" is false, the other two outputs are left unset, evaluating their "value" expressions (and as such the output of the action) to empty instead of false. This issue was found in the equivalent action in obs-plugintemplate. As that action is basically a mirror from the obs-studio action, let's fix it here too. --- .github/actions/setup-macos-codesigning/action.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-macos-codesigning/action.yaml b/.github/actions/setup-macos-codesigning/action.yaml index cc325d5fa..a2f8a0c00 100644 --- a/.github/actions/setup-macos-codesigning/action.yaml +++ b/.github/actions/setup-macos-codesigning/action.yaml @@ -27,13 +27,13 @@ outputs: value: ${{ steps.codesign.outputs.haveCodesignIdent }} haveProvisioningProfile: description: True if necessary provisioning profile credentials were found - value: ${{ steps.provisioning.outputs.haveProvisioningProfile }} + value: ${{ steps.provisioning.outputs.haveProvisioningProfile || steps.codesign.outputs.haveProvisioningProfile }} provisioningProfileUUID: description: UUID of imported provisioning profile value: ${{ steps.provisioning.outputs.provisioningProfileUUID }} haveNotarizationUser: description: True if necessary notarization credentials were found - value: ${{ steps.notarization.outputs.haveNotarizationUser }} + value: ${{ steps.notarization.outputs.haveNotarizationUser || steps.codesign.outputs.haveNotarizationUser }} codesignIdent: description: Code signing identity value: ${{ steps.codesign.outputs.codesignIdent }} @@ -95,6 +95,8 @@ runs: print "codesignTeam=${team_id}" >> $GITHUB_OUTPUT } else { print 'haveCodesignIdent=false' >> $GITHUB_OUTPUT + print 'haveProvisioningProfile=false' >> $GITHUB_OUTPUT + print 'haveNotarizationUser=false' >> $GITHUB_OUTPUT } - name: Provisioning Profile 👤