Skip to content

Commit 5fb9587

Browse files
committed
archive the binaries for generating assertion doc
1 parent e6758c8 commit 5fb9587

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.github/workflows/assertion.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@ name: Generate and Sign Assertion Document
44
on:
55
workflow_call:
66
inputs:
7-
packageVersion:
8-
required: true
9-
type: string
10-
arm64_sha:
11-
required: true
12-
type: string
13-
amd64_sha:
7+
artifact_name:
148
required: true
159
type: string
1610
secrets:
1711
ARTIFACTORY_USER:
1812
required: true
1913
ARTIFACTORY_TOKEN:
2014
required: true
15+
ARTIFACTORY_URL:
16+
required: true
2117

2218
jobs:
2319
build-assertion-document:
@@ -36,16 +32,16 @@ jobs:
3632
- name: Download nginx-agent binaries
3733
uses: actions/download-artifact@v3.0.2
3834
with:
39-
name: nginx-agent-binaries-${{ inputs.packageVersion }}
35+
name: nginx-agent-binaries-${{ inputs.packageVersion }}-${{ matrix.osarch }}
4036
path: ./artifacts
4137

4238
- name: Gather build dependencies
4339
id: godeps
4440
run: |
45-
ls -la artifacts/${{ matrix.osarch }}
46-
echo "agent_digest=$(cat artifacts/${{ matrix.osarch }}/nginx-agent.sha256)" >> $GITHUB_ENV
47-
echo "agent_buildstart=$(cat artifacts/${{ matrix.osarch }}/nginx-agent.buildstart)" >> $GITHUB_ENV
48-
echo "agent_buildend=$(cat artifacts/${{ matrix.osarch }}/nginx-agent.buildend)" >> $GITHUB_ENV
41+
ls -la artifacts
42+
echo "agent_digest=$(cat artifacts/nginx-agent.sha256)" >> $GITHUB_ENV
43+
echo "agent_buildstart=$(cat artifacts/nginx-agent.buildstart)" >> $GITHUB_ENV
44+
echo "agent_buildend=$(cat artifacts/nginx-agent.buildend)" >> $GITHUB_ENV
4945
5046
echo "Checking dependencies..."
5147
go version -m build/${{ matrix.osarch }}/nginx-agent > goversionm_${{ github.run_id }}_${{ github.run_number }}.txt

.github/workflows/release-branch.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,15 @@ jobs:
249249
250250
- name: Archive Binaries
251251
uses: actions/upload-artifact@v3.1.2 # v3.1.2
252+
matrix:
253+
osarch: [amd64, arm64]
252254
with:
253-
name: nginx-agent-binaries-${{ inputs.packageVersion }}
255+
name: nginx-agent-binaries-${{ inputs.packageVersion }}-${{ matrix.osarch }}
254256
path: |
255-
build/a*64
257+
build/${{ matrix.osarch }}/nginx-agent
258+
build/${{ matrix.osarch }}/nginx-agent.sha256
259+
build/${{ matrix.osarch }}/nginx-agent.buildstart
260+
build/${{ matrix.osarch }}/nginx-agent.buildend
256261
257262
- name: Install GPG tools
258263
if: ${{ inputs.publishPackages == true }}
@@ -280,7 +285,7 @@ jobs:
280285
- name: Generate assertion documents
281286
uses: .github/workflows/assertion.yml@${{ github.ref_name }}
282287
continue-on-error: true
283-
secrets:
288+
with:
284289
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
285290
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
286291
ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL_PROD }}

0 commit comments

Comments
 (0)