From dd8a24794e182cf07e81f0dd67e518debd775e56 Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:21:20 +0300 Subject: [PATCH 1/3] test PR --- .github/workflows/sbom.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index 4e5c6a2cc..4319ee7cc 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -85,6 +85,7 @@ jobs: name: Install proKey - run: | ## TODO: do not disable bomber by default (https://github.com/devops-kung-fu/bomber/issues/174) + echo "useBomber ${{github.event.inputs.useBomber}}" [ -z "${{github.event.inputs.useBomber}}" -o false = "${{github.event.inputs.useBomber}}" ] && A="$A --disable-bomber" [ false = "${{github.event.inputs.useOSV}}" ] && A="$A --disable-osv-scan" [ false = "${{github.event.inputs.useOWASP}}" ] && A="$A --disable-owasp" From bef336d3fec42d172314270da424f9539d610f57 Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:40:22 +0300 Subject: [PATCH 2/3] Update sbom.yml --- .github/workflows/sbom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index 4319ee7cc..bbc70641b 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -92,7 +92,7 @@ jobs: [ true = "${{github.event.inputs.useFullOWASP}}" ] && A="$A --enable-full-owasp" [ true = "${{github.event.inputs.useSnapshots}}" ] && A="$A --useSnapshots" V="${{ github.event.inputs.version || github.event.release.tag_name }}" - [ -n "$V" ] && A="--version $V" + [ -n "$V" ] && A="$A --version $V" cmd="scripts/generateAndCheckSBOM.js $A" echo "Running: $cmd" $cmd From a1929e7a9dea97f49cab63391152145676c23586 Mon Sep 17 00:00:00 2001 From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:56:06 +0300 Subject: [PATCH 3/3] remove echo --- .github/workflows/sbom.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml index bbc70641b..05c2a7f65 100644 --- a/.github/workflows/sbom.yml +++ b/.github/workflows/sbom.yml @@ -85,7 +85,6 @@ jobs: name: Install proKey - run: | ## TODO: do not disable bomber by default (https://github.com/devops-kung-fu/bomber/issues/174) - echo "useBomber ${{github.event.inputs.useBomber}}" [ -z "${{github.event.inputs.useBomber}}" -o false = "${{github.event.inputs.useBomber}}" ] && A="$A --disable-bomber" [ false = "${{github.event.inputs.useOSV}}" ] && A="$A --disable-osv-scan" [ false = "${{github.event.inputs.useOWASP}}" ] && A="$A --disable-owasp"