Skip to content

Commit ab1f40f

Browse files
committed
[skip ci] more log output when archiving binaries
1 parent a7268aa commit ab1f40f

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

.github/workflows/assertion.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ name: Generate and Sign Assertion Document
44
on:
55
workflow_call:
66
inputs:
7-
artifact_name:
8-
required: true
7+
packageVersion:
8+
description: 'Agent version'
99
type: string
10+
required: true
1011
secrets:
1112
ARTIFACTORY_USER:
1213
required: true
@@ -29,8 +30,13 @@ jobs:
2930
matrix:
3031
osarch: [amd64, arm64]
3132
steps:
33+
- name: Checkout Repository
34+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
35+
with:
36+
ref: refs/heads/improve-assertion-doc-generation
37+
3238
- name: Download nginx-agent binaries
33-
uses: actions/download-artifact@v3.0.2
39+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # 6.0.0
3440
with:
3541
name: nginx-agent-binaries-${{ inputs.packageVersion }}-${{ matrix.osarch }}
3642
path: ./artifacts
@@ -60,7 +66,7 @@ jobs:
6066
invocation-id: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
6167
artifactory-user: ${{ inputs.ARTIFACTORY_USER }}
6268
artifactory-api-token: ${{ inputs.ARTIFACTORY_TOKEN }}
63-
artifactory-url: ${{ secrets.ARTIFACTORY_URL }}
69+
artifactory-url: ${{ inputs.ARTIFACTORY_URL }}
6470
artifactory-repo: 'f5-nginx-go-local-approved-dependency'
6571
assertion-doc-file: assertion_nginx-agent_${{ github.ref_name }}_${{matrix.osarch}}.json
6672
build-content-path: ${{ env.goversionm }}

.github/workflows/release-branch.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ jobs:
102102

103103
- name: Create Draft Release
104104
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
105+
if: ${{ needs.vars.outputs.github_release == 'true' }}
105106
id: release
106107
env:
107108
version: ${{ inputs.packageVersion }}
@@ -201,10 +202,6 @@ jobs:
201202
git config --global user.name 'github-actions'
202203
git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
203204
git tag -a "v${{ inputs.packageVersion }}" -m "CI Autogenerated"
204-
205-
- name: Push Tags
206-
if: ${{ needs.vars.outputs.tag_release == 'true' }}
207-
run: |
208205
git push origin "v${{ inputs.packageVersion }}"
209206
210207
build-and-upload-packages:
@@ -246,9 +243,9 @@ jobs:
246243
PACKAGE_BUILD: ${{ inputs.packageBuildNo }}
247244
run: |
248245
export PATH=$PATH:~/go/bin
249-
250246
echo "$GPG_KEY" | base64 --decode > ${NFPM_SIGNING_KEY_FILE}
251247
make package
248+
find build/ -type f -name "nginx-agent*"
252249
253250
- name: Archive AMD64 Binaries
254251
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
@@ -269,6 +266,15 @@ jobs:
269266
build/arm64/nginx-agent.sha256
270267
build/arm64/nginx-agent.buildstart
271268
build/arm64/nginx-agent.buildend
269+
270+
- name: Generate assertion documents
271+
uses: ./.github/workflows/assertion.yml
272+
continue-on-error: true
273+
with:
274+
packageVersion: ${{ inputs.packageVersion }}
275+
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
276+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
277+
ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL_PROD }}
272278

273279
- name: Install GPG tools
274280
if: ${{ inputs.publishPackages == true }}
@@ -293,15 +299,6 @@ jobs:
293299
run: |
294300
make release
295301
296-
- name: Generate assertion documents
297-
uses: ./.github/workflows/assertion.yml
298-
continue-on-error: true
299-
with:
300-
packageVersion: ${{ inputs.packageVersion }}
301-
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
302-
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
303-
ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL_PROD }}
304-
305302
merge-release:
306303
if: ${{ needs.vars.outputs.create_pull_request == 'true' }}
307304
name: Merge release branch back into main branch

0 commit comments

Comments
 (0)