CI: Correctly check for platform in the sign-godot-project action

YuriSizov · Jun 6, 2024 · 7b55dd9 · 7b55dd9
1 parent de6d18f
commit 7b55dd9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/actions/sign-extension/action.yml b/.github/actions/sign-extension/action.yml
@@ -1,6 +1,10 @@
 name: Codesign GDSiON
 description: Codesign and notarize extension build artifacts.
 
+# This actions is close but slightly different to sign-godot-project. Eventually,
+# they may be unified. But for now care should be applied to keep them in sync when
+# it matters.
+
 inputs:
   setup-env:
     description: Flag that enables the setup step.

diff --git a/.github/actions/sign-godot-project/action.yml b/.github/actions/sign-godot-project/action.yml
@@ -1,7 +1,15 @@
 name: Codesign Godot Project
 description: Codesign and notarize Godot project export artifacts.
 
+# This actions is close but slightly different to sign-extension. Eventually,
+# they may be unified. But for now care should be applied to keep them in sync when
+# it matters.
+
 inputs:
+  platform:
+    description: Target platform.
+    required: true
+
   setup-env:
     description: Flag that enables the setup step.
     default: false
@@ -41,7 +49,7 @@ runs:
     # Setup.
 
     - name: Set up the signing environment (macos)
-      if: ${{ env.SCONS_PLATFORM == 'macos' && inputs.setup-env == 'true' }}
+      if: ${{ inputs.platform == 'macos' && inputs.setup-env == 'true' }}
       shell: bash
       env:
         APPLE_CERT_BASE64:   ${{ inputs.apple-cert-base64 }}
@@ -51,7 +59,7 @@ runs:
     # Codesign.
 
     - name: Sign and notarize the project (macos)
-      if: ${{ env.SCONS_PLATFORM == 'macos' && inputs.codesign == 'true' }}
+      if: ${{ inputs.platform == 'macos' && inputs.codesign == 'true' }}
       shell: bash
       env:
         APPLE_DEV_ID:       ${{ inputs.apple-dev-id }}

diff --git a/.github/workflows/example-export-project.yml b/.github/workflows/example-export-project.yml
@@ -92,6 +92,7 @@ jobs:
         if: ${{ inputs.with-codesign }}
         uses: ./.github/actions/sign-godot-project
         with:
+          platform: ${{ matrix.platform }}
           setup-env: true
           apple-cert-base64:   ${{ secrets.APPLE_CERT_BASE64 }}
           apple-cert-password: ${{ secrets.APPLE_CERT_PASSWORD }}
@@ -100,6 +101,7 @@ jobs:
         if: ${{ inputs.with-codesign }}
         uses: ./.github/actions/sign-godot-project
         with:
+          platform: ${{ matrix.platform }}
           codesign: true
           directory: ${{ steps.export-project-step.outputs.export-path }}
           target-name: ${{ matrix.app-name }}