Revert "Fix production signing"

This reverts commit 5a312d9.
AlbrechtL · Dec 8, 2024 · 61aef1f · 61aef1f
1 parent 5a312d9
commit 61aef1f
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -54,7 +54,6 @@ jobs:
             New-Item -ItemType directory -Path installer
             New-Item -ItemType directory -Path to_publish
             New-Item -ItemType directory -Path publish
-            New-Item -ItemType directory -Path publish_production
             
             echo "*** Copy non QT DLLs from welle.io-win-libs repository ***"
             Copy-Item ..\welle.io-win-libs\x64\*.dll installer -recurse # Libs
@@ -118,31 +117,34 @@ jobs:
           password: ${{ secrets.SFTP_PASSWORD }}
           local_dir: publish/
 
-      - name: Production sign installer with SignPath
-        id: production_signing_installer
-        uses: signpath/github-action-submit-signing-request@v1
 
-        # Production signing needs a manual step in SignPath within 5 minutes.
-        # During development we don't need each build signed with a production key.
-        # So we can accept to fail here
-        continue-on-error: true
+  production_signing:
+    name: Sign installer with production key
+    needs: qtbuild
+    runs-on: windows-latest
+
+    # Production signing needs a manual step in SignPath within 5 minutes.
+    # During development we don't need each build signed with a production key.
+    # So we can accept to fail here
+    continue-on-error: true 
 
+    steps:
+      - name: Production sign installer with SignPath
+        id: signing_installer
+        uses: signpath/github-action-submit-signing-request@v1
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
           organization-id: 'b7a507e8-ab76-445f-bfb5-05944bcbbee9'
           project-slug: 'welle.io'
           signing-policy-slug: 'release-signing'
-          github-artifact-id: '${{upload_artifact.outputs.artifact-id}}'
+          github-artifact-id: '${{needs.qtbuild.upload_artifact.outputs.artifact-id}}'
           wait-for-completion: true
           output-artifact-directory: 'publish_production'
 
       - name: Archive artifacts (welle.io Windows installer signed)
         id: upload_artifact_signed
         uses: actions/upload-artifact@v4
-        if: always() && steps.production_signing_installer.outcome == 'success'
         with:
           name: welle.io Windows installer production-signed
           path: publish_production\*.exe
-          if-no-files-found: error
-
-
+          if-no-files-found: error