Skip to content

Commit f0e09b7

Browse files
committed
gh-actions: m github.run_id is a string
1 parent e386e7d commit f0e09b7

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,10 @@ jobs:
318318
if: ${{ needs.build.result == 'success' && needs.attestation.result == 'success' && needs.build.outputs.publish == 'true' }}
319319
uses: ./.github/workflows/publish.yml
320320
with:
321-
run-id: ${{ github.run_id }}
321+
run_id: ${{ github.run_id }}
322322
vcsver: ${{ needs.build.outputs.vcs-ver }}
323-
artifact-subjects: ${{ needs.build.outputs.artifact-subjects }}
324-
sbom-info: ${{ needs.build.outputs.sbom-info }}
323+
artifact_subjects: ${{ needs.build.outputs.artifact-subjects }}
324+
sbom_info: ${{ needs.build.outputs.sbom-info }}
325325
secrets: inherit
326326

327327
osv:

.github/workflows/publish.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ name: Publisher
33
on:
44
workflow_dispatch:
55
inputs:
6-
build-run-id:
7-
description: "Workflow run id that produced signed artifacts (from go.yml build job)"
6+
build_run_id:
87
required: true
9-
type: number
8+
type: string
109
workflow_call:
1110
inputs:
12-
run-id:
11+
# docs.github.com/en/actions/reference/workflows-and-actions/contexts
12+
run_id:
1313
description: "Workflow run id that produced signed artifacts"
1414
required: true
15-
type: number
15+
type: string
1616
vcsver:
1717
description: "Short git version"
1818
required: false
1919
type: string
20-
artifact-subjects:
20+
artifact_subjects:
2121
description: "JSON array of artifact subjects with sha256 digests"
2222
required: false
2323
type: string
24-
sbom-info:
24+
sbom_info:
2525
description: "SBOM info JSON blob with subjects and digest"
2626
required: false
2727
type: string
@@ -54,11 +54,11 @@ jobs:
5454
# POM for Maven Central
5555
POM_OSSRH: ossrhpom.xml
5656
DIST_DIR: dist
57-
RUN_ID: ${{ inputs.run-id || inputs['build-run-id'] }}
57+
RUN_ID: ${{ inputs.run_id || inputs.build_run_id }}
5858
VCSVER_INPUT: ${{ inputs.vcsver }}
5959
# workflow input constants
60-
ARTIFACT_SUBJECTS: ${{ inputs['artifact-subjects'] }}
61-
SBOM_INFO: ${{ inputs['sbom-info'] }}
60+
ARTIFACT_SUBJECTS: ${{ inputs.artifact_subjects }}
61+
SBOM_INFO: ${{ inputs.sbom_info }}
6262
ARTIFACT_PATTERN: "firestack-aar-*"
6363
SBOM_PATTERN: "firestack-sbom-*"
6464
SBOM_MANIFEST: "manifest.spdx.json"

0 commit comments

Comments
 (0)