Skip to content

Commit 1e79c59

Browse files
vaadin-botmanolo
andauthored
chore: fix bomber flag again [skip ci] (#4580) (#4584)
Co-authored-by: Manuel Carrasco Moñino <manolo@vaadin.com>
1 parent 1353841 commit 1e79c59

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/sbom.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ on:
1616
description: 'Use bomber'
1717
required: false
1818
type: boolean
19-
## TODO: do not disable bomber by default (https://github.com/devops-kung-fu/bomber/issues/174)
20-
default: false
19+
default: true
2120
useOSV:
2221
description: 'Use osv-scanner'
2322
required: false
@@ -85,9 +84,10 @@ jobs:
8584
echo '{"username":"'`echo ${{secrets.TB_LICENSE}} | cut -d / -f1`'","proKey":"'`echo ${{secrets.TB_LICENSE}} | cut -d / -f2`'"}' > ~/.vaadin/proKey
8685
name: Install proKey
8786
- run: |
87+
## TODO: do not disable bomber by default (https://github.com/devops-kung-fu/bomber/issues/174)
8888
[ -z "${{github.event.inputs.useBomber}}" -o false = "${{github.event.inputs.useBomber}}" ] && A="$A --disable-bomber"
89-
[ -z "${{github.event.inputs.useOSV}}" -o false = "${{github.event.inputs.useOSV}}" ] && A="$A --disable-osv-scan"
90-
[ -z "${{github.event.inputs.useOWASP}}" -o false = "${{github.event.inputs.useOWASP}}" ] && A="$A --disable-owasp"
89+
[ false = "${{github.event.inputs.useOSV}}" ] && A="$A --disable-osv-scan"
90+
[ false = "${{github.event.inputs.useOWASP}}" ] && A="$A --disable-owasp"
9191
[ true = "${{github.event.inputs.useFullOWASP}}" ] && A="$A --enable-full-owasp"
9292
[ true = "${{github.event.inputs.useSnapshots}}" ] && A="$A --useSnapshots"
9393
V="${{ github.event.inputs.version || github.event.release.tag_name }}"

scripts/generateAndCheckSBOM.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ function sortReleases(releases) {
243243
}
244244

245245
async function computeLastVersions(release) {
246-
const releases = (await run(`git tag`, { debug: false })).stdout.split('\n').filter(l => /^2[43]\.[03]/.test(l));
246+
const releases = (await run(`git tag`, { debug: false })).stdout.split('\n').filter(l => /^[2-9][3-9]\.\d/.test(l));
247247
const minor = release.replace(/^(\d+\.\d+).*$/, '$1');
248248
let sorted = sortReleases([release, ...releases]);
249249
const lastPatch = sorted[sorted.indexOf(release) + 1];

0 commit comments

Comments
 (0)