From d9084ddb85fb015f00b34a86b3e7157c654914ee Mon Sep 17 00:00:00 2001 From: Mario Constanti Date: Wed, 27 Dec 2023 11:33:26 +0100 Subject: [PATCH] chore: enable blackduck scan on version build (#47) Blackduck seems to be "stable" again - so let's enable it for new versions again. It's already active on main Signed-off-by: Mario Constanti --- .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 4050495a..0da0ed4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,22 +31,22 @@ jobs: with: go-version: '1.21.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: release run: make release diff --git a/.goreleaser.yaml b/.goreleaser.yaml index c76b24f2..3d903716 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -61,8 +61,8 @@ release: - glob: tmp/garm_operator_all.yaml - glob: tmp/garm_operator_crds.yaml - glob: tmp/garm_operator.yaml - # - 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 }}`