Skip to content

Commit 273a72f

Browse files
committed
gh-actions: upload aar artifacts by full name
1 parent df1c91b commit 273a72f

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/go.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
# go test -v -race -bench=. -benchtime=100ms ./...
5656
echo "::notice::success"
5757
58+
# ref: make-aar for output file names
5859
# for provenance, better to upload as soon as possible
5960
# github.com/actions/upload-artifact
6061
- name: 🚀 Upload
@@ -63,7 +64,8 @@ jobs:
6364
with:
6465
name: firestack-aar-${{ github.sha }} # must be unique
6566
path: |
66-
firestack*.aar # see: make-aar
67+
firestack.aar
68+
firestack-debug.aar
6769
build/intra/tun2socks-sources.jar
6870
retention-days: 52 # 0-90; 90 is max
6971
if-no-files-found: error # error, warn (default), ignore
@@ -252,7 +254,7 @@ jobs:
252254
subjects=$(jq -c --arg name "$artifact" --arg digest "$digest" '. + [{ "name": $name, "digest": $digest }]' <<<"$subjects")
253255
done
254256
255-
sbom_path="${SBOM_PATH}"
257+
sbom_path="${SBOM_PATH}/${SBOM_FNAME}"
256258
if [ ! -f "$sbom_path" ]; then
257259
echo "::error::missing SBOM at ${sbom_path}"
258260
exit 13
@@ -283,6 +285,7 @@ jobs:
283285
printf 'vcs-ver=%s\n' "$VCSVER" >> "$GITHUB_OUTPUT"
284286
shell: bash
285287
env:
288+
SBOM_PATH: _manifest/spdx_2.2/
286289
SBOM_FNAME: manifest.spdx.json
287290
SBOM_ARTIFACT_ID: ${{ steps.sbom-upload.outputs.artifact-id }}
288291
SBOM_ARTIFACT_NAME: ${{ format('firestack-sbom-{0}', github.sha) }}

0 commit comments

Comments
 (0)