From 829b4d390b4fa94d8ac4571c109946aea94d956d Mon Sep 17 00:00:00 2001 From: Leon Wright Date: Fri, 5 Jul 2024 15:05:21 +0800 Subject: [PATCH 1/2] chore: Bump cache action version --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38063104f..69969ecdf 100644 --- 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 From c24fa56b0a8230c701337d203b9c542148301752 Mon Sep 17 00:00:00 2001 From: Leon Wright Date: Fri, 5 Jul 2024 15:07:03 +0800 Subject: [PATCH 2/2] feat: Update Sign Release There has been a bump in the sign release action version, with a breaking change. This passes through the artifact id, which is now a requirement. #1354 --- .github/workflows/build.yml | 1 + .github/workflows/release.yml | 4 ++-- .github/workflows/smoke.yml | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69969ecdf..921cdcce7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,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 index 1b9b4ee88..528cb626e 100644 --- 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 index 8d07d14cd..89df92ed5 100644 --- 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: