Merge #4117 Update Artifact Signing

KSP-CKAN · Jul 5, 2024 · dd61d9c · dd61d9c
2 parents ba63901 + c24fa56
commit dd61d9c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,24 +6,30 @@ on:
       configuration:
         type: string
         default: Debug
+    outputs:
+      repack-artifact-id:
+        description: "Artifact ID of the repack"
+        value: ${{ jobs.build.outputs.repack-artifact-id }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      repack-artifact-id: ${{ steps.upload-repack-artifact.outputs.artifact-id }}
     steps:
       - uses: actions/checkout@v4
       - name: Restore cache for _build/tools
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: _build/tools
           key: build-tools-${{ hashFiles('build', 'build.ps1', 'build.cake') }}
       - name: Restore cache for _build/cake
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: _build/cake
           key: build-cake-${{ hashFiles('build.cake') }}
       - name: Restore cache for _build/lib/nuget
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             _build/lib/nuget
@@ -32,6 +38,7 @@ jobs:
       - name: Build ckan.exe and netkan.exe
         run: ./build --configuration=${{ inputs.configuration }}
       - name: Upload repack artifact
+        id: upload-repack-artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.configuration }}-repack-unsigned

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,14 +23,14 @@ jobs:
     outputs:
       artifact-url: ${{steps.sign.outputs.signing-request-id }}
     steps:
-      - uses: signpath/github-action-submit-signing-request@v0.3
+      - uses: signpath/github-action-submit-signing-request@v0.4
         id: sign
         with:
           api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
           organization-id: 0cd9fc3f-b78d-4214-b152-b2e93c952e14
           project-slug: CKAN
           signing-policy-slug: test-signing
-          github-artifact-name: Release-repack-unsigned
+          github-artifact-id: ${{ needs.smoke-inflator.outputs.repack-artifact-id }}
           artifact-configuration-slug: release
           wait-for-completion: true
 

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -7,6 +7,10 @@ on:
       - synchronize
       - reopened
   workflow_call:
+    outputs:
+      repack-artifact-id:
+        description: "Artifact ID of the repack"
+        value: ${{ jobs.build-release.outputs.repack-artifact-id }}
 
 jobs:
   build-release:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,7 +54,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Build nuget package, support netstandard2.0 build (#4039 by: HebaruSan)
 - [Core] Use fully sanitized archive.org bucket names (#4043 by: HebaruSan)
 - [Netkan] Omit duplicate inflation warnings in queue (#4071 by: HebaruSan)
-- [Build] Refactor + Modernise Actions (#4082, #4088, #4089, #4091, #4093, #4094, #4095 by: techman83, HebaruSan; reviewed: HebaruSan)
+- [Build] Refactor + Modernise Actions (#4082, #4088, #4089, #4091, #4093, #4094, #4095, #4117 by: techman83, HebaruSan; reviewed: HebaruSan)
 - [Multiple] Translation updates from Crowdin (#4105 by: vinix38, frankieorabona, ambition, Francesco Ricina, S.O.2; reviewed: HebaruSan)
 
 ## v1.34.4 (Niven)