Skip to content

Commit cb7d937

Browse files
authored
Merge pull request DeusData#2249 from DeusData/distill/2109-ci-pins-and-sbom
ci: pin the noble-dependent runners, and attest the SBOM without the wrapper
2 parents fc70534 + a45a99c commit cb7d937

3 files changed

Lines changed: 23 additions & 4 deletions

File tree

‎.github/workflows/_lint.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ permissions:
1010

1111
jobs:
1212
lint:
13-
runs-on: ubuntu-latest
13+
# Pinned, not ubuntu-latest: the LLVM install below adds an
14+
# apt.llvm.org llvm-toolchain-NOBLE repo, which is 24.04 by name. When
15+
# GitHub moves ubuntu-latest to the next LTS this job breaks on a day
16+
# nobody chose. Pin the runner to the release the repo line already names.
17+
runs-on: ubuntu-24.04
1418
# 15 min proved too tight on a slow runner day and a timed-out lint reads
1519
# as "cancelled", which the release graph must treat as a hard stop; keep
1620
# a bound, but one only a genuine hang can hit (normal runtime ~5 min).
@@ -60,7 +64,8 @@ jobs:
6064
# provability (never suppressed — the NOLINT ban applies here too).
6165
# Vendored-tree diagnostics are path-filtered, mirroring .cppcheck.
6266
lint-mem:
63-
runs-on: ubuntu-latest
67+
# Pinned for the same reason as `lint`: llvm-toolchain-noble-21 below.
68+
runs-on: ubuntu-24.04
6469
timeout-minutes: 60
6570
steps:
6671
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

‎.github/workflows/_test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,9 @@ jobs:
245245
# parallel suite — catches what an older compiler-rt can miss. Same
246246
# canonical scripts/test.sh wave as every other leg.
247247
test-diag:
248-
runs-on: ubuntu-latest
248+
# Pinned for the same reason as the lint jobs: the pinned diagnostic
249+
# toolchain below installs from llvm-toolchain-noble-21.
250+
runs-on: ubuntu-24.04
249251
timeout-minutes: 120
250252
steps:
251253
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,20 @@ jobs:
236236
- name: Generate SBOM
237237
run: python3 scripts/ci/generate-sbom.py "${{ inputs.version }}"
238238

239+
# actions/attest-sbom is deprecated. What it does now is emit
240+
# "::warning::actions/attest-sbom has been deprecated" and forward to
241+
# actions/attest with NODE_OPTIONS set, passing sbom-path straight
242+
# through. Calling attest directly produces the same attestation without
243+
# the wrapper, and sbom-path is a first-class input there (verified
244+
# against the action definition at this exact SHA, which is tag v4.1.0).
245+
#
246+
# This step deliberately carries no continue-on-error: a release must
247+
# fail if its SBOM cannot be attested. An unattested SBOM is worse than
248+
# an absent one, because the artifact still ships looking complete.
239249
- name: Attest SBOM
240-
uses: actions/attest-sbom@c604332985a26aa8cf1bdc465b92731239ec6b9e # v4.1.0
250+
uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
251+
env:
252+
NODE_OPTIONS: '--max-http-header-size=32768'
241253
with:
242254
subject-path: '*.tar.gz'
243255
sbom-path: 'sbom.json'

0 commit comments

Comments
 (0)