From 50c0bd1762f717a6c69ede768d670fe2d65b6ff1 Mon Sep 17 00:00:00 2001 From: rthalho Date: Mon, 30 Sep 2024 09:49:16 +0200 Subject: [PATCH] fix: add notices file and risk report to release artifacts --- .github/workflows/release.yml | 32 ++++++++++++++++---------------- .goreleaser.yaml | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30ae3a25..2edfa146 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,22 +31,22 @@ jobs: with: go-version: '1.22.5' - # - name: Synopsys Detect - # run: | - # GITHUB_REF="$(echo $GITHUB_REF_NAME | tr ':/' '_')" - # BLACKDUCK_SCAN_VERSION_NAME="${GITHUB_REF}_${GITHUB_SHA}" - # export BLACKDUCK_SCAN_VERSION_NAME - - # # create the tmp directory as we also do during the release process - # mkdir -p tmp - - # ./hack/foss-scan.sh - - # mv tmp/Black_Duck_Notices_Report.txt tmp/3RD_PARTY_LICENSES.txt - # env: - # BLACKDUCK_URL: ${{ secrets.BLACKDUCK_URL }} - # BLACKDUCK_PROJECT_NAME: ${{ secrets.BLACKDUCK_PROJECT_NAME }} - # BLACKDUCK_TOKEN: ${{ secrets.BLACKDUCK_TOKEN }} + - name: Synopsys Detect + run: | + GITHUB_REF="$(echo $GITHUB_REF_NAME | tr ':/' '_')" + BLACKDUCK_SCAN_VERSION_NAME="${GITHUB_REF}_${GITHUB_SHA}" + export BLACKDUCK_SCAN_VERSION_NAME + + # create the tmp directory as we also do during the release process + mkdir -p tmp + + ./hack/foss-scan.sh + + mv tmp/Black_Duck_Notices_Report.txt tmp/3RD_PARTY_LICENSES.txt + env: + BLACKDUCK_URL: ${{ secrets.BLACKDUCK_URL }} + BLACKDUCK_PROJECT_NAME: ${{ secrets.BLACKDUCK_PROJECT_NAME }} + BLACKDUCK_TOKEN: ${{ secrets.BLACKDUCK_TOKEN }} - name: SBOM run: make sbom diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a52504b0..6488f969 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -62,8 +62,8 @@ release: - glob: tmp/garm_operator_crds.yaml - glob: tmp/garm_operator.yaml - glob: tmp/garm-operator.bom.spdx - # - glob: tmp/3RD_PARTY_LICENSES.txt - # - glob: tmp/BlackDuck_RiskReport.pdf + - glob: tmp/3RD_PARTY_LICENSES.txt + - glob: tmp/BlackDuck_RiskReport.pdf header: | Container image is available at `ghcr.io/mercedes-benz/garm-operator/{{ .ProjectName }}:v{{ .Version }}`