diff --git a/.github/workflows/build-test-multiarch.yaml b/.github/workflows/build-test-multiarch.yaml index 41ac538..a68d797 100644 --- a/.github/workflows/build-test-multiarch.yaml +++ b/.github/workflows/build-test-multiarch.yaml @@ -907,12 +907,14 @@ jobs: shell: bash env: TARGET_ARCH: ${{ matrix.target.arch }} + SBOM_COMPONENT_COUNT: ${{ steps.sbom.outputs.component_count }} + SBOM_DEPENDENCY_MANAGER: ${{ steps.sbom.outputs.dependency_manager }} run: | # SBOM summary { echo "## SBOM Summary ($TARGET_ARCH)" - echo "SBOM count: ${{ steps.sbom.outputs.component_count }}" - echo "Tool used: ${{ steps.sbom.outputs.dependency_manager }}" + echo "SBOM count: ${SBOM_COMPONENT_COUNT}" + echo "Tool used: ${SBOM_DEPENDENCY_MANAGER}" } >> "$GITHUB_STEP_SUMMARY" - name: 'Install Grype' diff --git a/.github/workflows/build-test-release-multiarch.yaml b/.github/workflows/build-test-release-multiarch.yaml index 8915dcf..060ff2a 100644 --- a/.github/workflows/build-test-release-multiarch.yaml +++ b/.github/workflows/build-test-release-multiarch.yaml @@ -515,9 +515,10 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ steps.tag-validate.outputs.tag_name }} run: | # Ensure draft release exists - TAG="${{ steps.tag-validate.outputs.tag_name }}" + TAG="${TAG_NAME}" # Check if release exists and get its draft status if RELEASE_INFO=$(gh release view "$TAG" \ --json isDraft 2>/dev/null); then @@ -1021,12 +1022,14 @@ jobs: shell: bash env: TARGET_ARCH: ${{ matrix.target.arch }} + SBOM_COMPONENT_COUNT: ${{ steps.sbom.outputs.component_count }} + SBOM_DEPENDENCY_MANAGER: ${{ steps.sbom.outputs.dependency_manager }} run: | # SBOM summary { echo "## SBOM Summary ($TARGET_ARCH)" - echo "SBOM count: ${{ steps.sbom.outputs.component_count }}" - echo "Tool used: ${{ steps.sbom.outputs.dependency_manager }}" + echo "SBOM count: ${SBOM_COMPONENT_COUNT}" + echo "Tool used: ${SBOM_DEPENDENCY_MANAGER}" } >> "$GITHUB_STEP_SUMMARY" grype: @@ -1337,8 +1340,9 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ needs.tag-validate.outputs.tag }} run: | - TAG="${{ needs.tag-validate.outputs.tag }}" + TAG="${TAG_NAME}" if gh release view "$TAG" --json isDraft --jq '.isDraft' \ 2>/dev/null | grep -q "false"; then echo "Release $TAG is already promoted, skipping promotion" @@ -1365,7 +1369,8 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ needs.tag-validate.outputs.tag }} run: | - TAG="${{ needs.tag-validate.outputs.tag }}" + TAG="${TAG_NAME}" RELEASE_URL=$(gh release view "$TAG" --json url --jq '.url') echo "release_url=$RELEASE_URL" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/build-test-release.yaml b/.github/workflows/build-test-release.yaml index dfde0c6..b009632 100644 --- a/.github/workflows/build-test-release.yaml +++ b/.github/workflows/build-test-release.yaml @@ -457,9 +457,10 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ steps.tag-validate.outputs.tag_name }} run: | # Ensure draft release exists - TAG="${{ steps.tag-validate.outputs.tag_name }}" + TAG="${TAG_NAME}" # Check if release exists and get its draft status if RELEASE_INFO=$(gh release view "$TAG" \ --json isDraft 2>/dev/null); then @@ -775,12 +776,15 @@ jobs: - name: 'SBOM summary' shell: bash + env: + SBOM_COMPONENT_COUNT: ${{ steps.sbom.outputs.component_count }} + SBOM_DEPENDENCY_MANAGER: ${{ steps.sbom.outputs.dependency_manager }} run: | # SBOM summary { echo "## SBOM Summary" - echo "SBOM count: ${{ steps.sbom.outputs.component_count }}" - echo "Tool used: ${{ steps.sbom.outputs.dependency_manager }}" + echo "SBOM count: ${SBOM_COMPONENT_COUNT}" + echo "Tool used: ${SBOM_DEPENDENCY_MANAGER}" } >> "$GITHUB_STEP_SUMMARY" grype: @@ -1076,8 +1080,9 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ needs.tag-validate.outputs.tag }} run: | - TAG="${{ needs.tag-validate.outputs.tag }}" + TAG="${TAG_NAME}" if gh release view "$TAG" --json isDraft --jq '.isDraft' \ 2>/dev/null | grep -q "false"; then echo "Release $TAG is already promoted, skipping promotion" @@ -1104,7 +1109,8 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG_NAME: ${{ needs.tag-validate.outputs.tag }} run: | - TAG="${{ needs.tag-validate.outputs.tag }}" + TAG="${TAG_NAME}" RELEASE_URL=$(gh release view "$TAG" --json url --jq '.url') echo "release_url=$RELEASE_URL" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index feed6f8..7cf91a8 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -649,12 +649,15 @@ jobs: - name: 'SBOM summary' shell: bash + env: + SBOM_COMPONENT_COUNT: ${{ steps.sbom.outputs.component_count }} + SBOM_DEPENDENCY_MANAGER: ${{ steps.sbom.outputs.dependency_manager }} run: | # SBOM summary { echo "## SBOM Summary" - echo "SBOM count: ${{ steps.sbom.outputs.component_count }}" - echo "Tool used: ${{ steps.sbom.outputs.dependency_manager }}" + echo "SBOM count: ${SBOM_COMPONENT_COUNT}" + echo "Tool used: ${SBOM_DEPENDENCY_MANAGER}" } >> "$GITHUB_STEP_SUMMARY" grype: