Skip to content

Commit dae9dd4

Browse files
authored
Merge branch 'main' into feature/better-test-integration
2 parents d2bda3e + 071be55 commit dae9dd4

22 files changed

+132
-96
lines changed

.devcontainer/cpp/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
1+
FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782
22

33
ARG BATS_VERSION=1.11.0
44
ARG CCACHE_VERSION=4.10.1

.devcontainer/cpp/apt-requirements-base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"gnupg2": "2.4.4-2ubuntu17",
88
"ninja-build": "1.11.1-2",
99
"python3-pip": "24.0+dfsg-1ubuntu1.1",
10-
"udev": "255.4-1ubuntu8.4",
10+
"udev": "255.4-1ubuntu8.5",
1111
"unzip": "6.0-28ubuntu4.1",
1212
"wget": "1.21.4-1ubuntu4.1",
1313
"xsltproc": "1.1.39-0exp1build1",

.devcontainer/cpp/devcontainer-metadata-vscode.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
1010
1111
12-
"ms-vscode.cmake-tools@1.19.52",
13-
"ms-vscode.cpptools@1.22.11",
12+
"ms-vscode.cmake-tools@1.20.52",
13+
"ms-vscode.cpptools@1.23.6",
1414
15-
"sonarsource.sonarlint-vscode@4.15.0"
15+
"sonarsource.sonarlint-vscode@4.16.0"
1616
],
1717
"settings": {
1818
"C_Cpp.intelliSenseEngine": "disabled",

.devcontainer/cpp/requirements.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cmake==3.31.4
2-
conan==2.11.0
1+
cmake==3.31.6
2+
conan==2.13.0
33
gcovr==8.3

.devcontainer/cpp/requirements.txt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -115,27 +115,27 @@ charset-normalizer==3.4.0 \
115115
--hash=sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079 \
116116
--hash=sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482
117117
# via requests
118-
cmake==3.31.4 \
119-
--hash=sha256:20be7cdb41903edf85e8a498c4beff8d6854acbb087abfb07c362c738bdf0018 \
120-
--hash=sha256:225d9a643b0b60ffce0399ff0cabd7a4820e0dbcb794e97d3aacfcf7c0589ae6 \
121-
--hash=sha256:23781e17563693a68b0cef85749746894b8a61488e56e96fc6649b73652e8236 \
122-
--hash=sha256:25c5094394f0cee21130b5678e5b4552f72470e266df6d6fb1d5c505100f0eaa \
123-
--hash=sha256:2a37be93534df04513f0845492d71bc80899c3f87b77e3b01c95aff1a7fc9bde \
124-
--hash=sha256:466c9295af440bb4a47cc5e1af10576cf2227620528afd0fd0b3effa1d513b49 \
125-
--hash=sha256:838a388b559137f3654d8cf30f62bbdec10f8d1c3624f0d289614d33cdf4fba1 \
126-
--hash=sha256:89143a5e2a5916061f2cfc5012e9fe6281aaf7c0dae7930bdc68d105d22ddc39 \
127-
--hash=sha256:926d91cae2ba7d2f3df857d0fc066bdac4f3904bf5c95e99b60435e85aabedb4 \
128-
--hash=sha256:929a8d8d289d69e43784661748ddd08933ce1ec5db8f9bcfce6ee817a48f8787 \
129-
--hash=sha256:9479a9255197c49e135df039d8484c69aa63158a06ae9c2d0eb939da2f0f7dff \
130-
--hash=sha256:a6a3b0b9557f41c955a6b25c94205f2ca9c3a46edca809ad87507c5ef6bc4274 \
131-
--hash=sha256:a6ac2242e0b16ad7d94c9f8572d6f232e6169747be50e5cdf497f206c4819ce1 \
132-
--hash=sha256:b463efdf5b92f3b290235aa9f8da092b3dac19b7636c563fd156022dab580649 \
133-
--hash=sha256:c9f5f8289c5e7bd2ed654cbac164021fa7723064fee0443a2f0068bc08413d81 \
134-
--hash=sha256:d378c9e58eac906bddafd673c7571262dcd5a9946bb1e8f9e3902572a8fa95ca \
135-
--hash=sha256:f6af3b83a1b1fc1d990d18b6a566ee9c95c0393f986c6df15f2505dda8ad1bcc \
136-
--hash=sha256:f96127bf663168accd29d5a50ee68ea80f26bcd37f96c7a14ef2378781f19936 \
137-
--hash=sha256:fc048b4b70facd16699a43c737f6782b4eff56e8e6093090db5979532d9db0f6
138-
# via -r cpp/requirements.in
118+
cmake==3.31.6 \
119+
--hash=sha256:024a79ca3d2c355f75875b6cc92d907afd710d1a4ffde2f20a7da712a2f4b1c3 \
120+
--hash=sha256:112b36427e59bd26145b705a49d5f70b16433a655ce807cb8fdd81dd4d0e60c2 \
121+
--hash=sha256:13f2e636dc27834fe096f53301d6efb913b4b501fdc0ed03f386c0a7e7ec1a21 \
122+
--hash=sha256:1c8b05df0602365da91ee6a3336fe57525b137706c4ab5675498f662ae1dbcec \
123+
--hash=sha256:2297e9591307d9c61e557efe737bcf4d7c13a30f1f860732f684a204fee24dca \
124+
--hash=sha256:42d9883b8958da285d53d5f69d40d9650c2d1bcf922d82b3ebdceb2b3a7d4521 \
125+
--hash=sha256:4326f6c6f39867a60e2822fea8e6aedbcac09c9f59ad3f0f3386a890a2c8d89d \
126+
--hash=sha256:547efc1d0e27a194da819a0392fe645a9b8f1485bc2c3f34ae4f1e682cfd3153 \
127+
--hash=sha256:689441fc74fbb03673c67e20d4636614a231634d5e803387cd213d2cdf9675fc \
128+
--hash=sha256:6cb97adae7e5390ce68f8b7f38e1be1c72bf19e9f6727f31f8fa1c095b39be88 \
129+
--hash=sha256:6f77db820af725bb92fab60c4c9d67f64442ac0ea9b933aca4cd4586219cbd1f \
130+
--hash=sha256:8b67bf9613dfb59c12ce643c6be582c49c981e6eee28c4c244aeb3248b33f05e \
131+
--hash=sha256:8edddfbf367fa1bcf4b9f3064470bc0e1022f70609c0cf69c863961897826205 \
132+
--hash=sha256:9eed74a1f2a29a7cd92a9f071a35d64645b19802beb393ec250d6e7c09441314 \
133+
--hash=sha256:9f170e3c6933dba64f333cb456823bbb1d0ac126f94aa4a577e40855d2b1ca49 \
134+
--hash=sha256:bbaed969cef3c427f4f17591feb28db4ae595e3a4bbd45cb35522cee14df6a32 \
135+
--hash=sha256:ce5fc0299ecafe489b2614daa6176c3c2baacea6bc3b359bac9aa25b46ed43e9 \
136+
--hash=sha256:cefb910be81e1b4fdc3b89ef61819c3e848b3906ed56ac36d090f37cfa05666b \
137+
--hash=sha256:da9d4fd9abd571fd016ddb27da0428b10277010b23bb21e3678f8b9e96e1686e
138+
# via -r requirements.in
139139
colorama==0.4.6 \
140140
--hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
141141
--hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
@@ -144,9 +144,9 @@ colorlog==6.8.2 \
144144
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
145145
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
146146
# via gcovr
147-
conan==2.11.0 \
148-
--hash=sha256:87f78a295716d1a37dfabc26f5d1b6a0ed49594618ea339420bb89627ececeda
149-
# via -r cpp/requirements.in
147+
conan==2.13.0 \
148+
--hash=sha256:0ad929984e5842fe6bb686361ae1a6240e28b24a6df09aab2c87aaa46ff71f33
149+
# via -r requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \
152152
--hash=sha256:99522ca3e365cac527b44bde033f64c6945d90eb9f769703caaec52b09bbd3ff
@@ -158,14 +158,14 @@ fasteners==0.19 \
158158
gcovr==8.3 \
159159
--hash=sha256:d613a90aeea967b4972fbff69587bf8995ee3cd80df2556983b73141f30642d2 \
160160
--hash=sha256:faa371f9c4a7f78c9800da655107d4f99f04b718d1c0d9f48cafdcbef0049079
161-
# via -r cpp/requirements.in
161+
# via -r requirements.in
162162
idna==3.10 \
163163
--hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
164164
--hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
165165
# via requests
166-
jinja2==3.1.5 \
167-
--hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
168-
--hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
166+
jinja2==3.1.6 \
167+
--hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
168+
--hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
169169
# via
170170
# conan
171171
# gcovr

.devcontainer/rust/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
1+
FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782
22

33
ARG BATS_VERSION=1.11.0
44
ARG CARGO_BINSTALL_VERSION=1.10.22

.devcontainer/rust/apt-requirements-base.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"g++-14": "14.2.0-4ubuntu2~24.04",
55
"git": "1:2.43.0-1ubuntu7.2",
66
"gnupg2": "2.4.4-2ubuntu17",
7-
"libc6-dev": "2.39-0ubuntu8.3",
7+
"libc6-dev": "2.39-0ubuntu8.4",
88
"rustup": "1.26.0-5build1",
9-
"udev": "255.4-1ubuntu8.4",
9+
"udev": "255.4-1ubuntu8.5",
1010
"wget": "1.21.4-1ubuntu4.1",
1111
"xz-utils": "5.6.1+really5.4.5-1build0.1"
1212
}

.devcontainer/rust/devcontainer-metadata-vscode.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"extensions": [
88
99
10-
10+
1111
12-
"usernamehw.errorlens@3.22.0"
12+
"usernamehw.errorlens@3.23.0"
1313
]
1414
}
1515
}

.github/workflows/acceptance-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
test:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
22+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2323
with:
2424
egress-policy: audit
2525
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -68,7 +68,7 @@ jobs:
6868
GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
6969
GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
7070
GITHUB_TOTP_SECRET: ${{ secrets.TEST_GITHUB_TOTP_SECRET }}
71-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
71+
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
7272
if: always()
7373
with:
7474
name: playwright-artifacts

.github/workflows/build-push.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ env:
2020

2121
jobs:
2222
build-push:
23-
runs-on: ubuntu-latest
23+
# The ARM64 build segfaults with Ubuntu 24.04, so use 22.04 (for now)
24+
runs-on: ubuntu-22.04
2425
permissions:
2526
attestations: write
2627
# dependency-submission needs contents write permission.
@@ -33,20 +34,20 @@ jobs:
3334
matrix:
3435
flavor: ["cpp", "rust"]
3536
steps:
36-
- uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
37+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3738
with:
3839
egress-policy: audit
3940
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4041
with:
4142
persist-credentials: false
42-
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
43+
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
4344
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
4445
if: github.event_name != 'merge_group'
4546
with:
4647
registry: ${{ env.REGISTRY }}
4748
username: ${{ github.actor }}
4849
password: ${{ secrets.GITHUB_TOKEN }}
49-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
50+
- uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
5051
if: matrix.flavor == 'cpp'
5152
id: buildkit-cache
5253
with:
@@ -62,7 +63,7 @@ jobs:
6263
"root-ccache": "/root/.ccache"
6364
}
6465
skip-extraction: ${{ steps.buildkit-cache.outputs.cache-hit }}
65-
- uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
66+
- uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
6667
id: metadata
6768
env:
6869
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
@@ -82,7 +83,7 @@ jobs:
8283
id: devcontainer-metadata
8384
- run: echo "git-commit-epoch=$(git log -1 --pretty=%ct)" >> "$GITHUB_OUTPUT"
8485
id: devcontainer-epoch
85-
- uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
86+
- uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
8687
id: build-and-push
8788
env:
8889
SOURCE_DATE_EPOCH: ${{ steps.devcontainer-epoch.outputs.git-commit-epoch }}
@@ -118,7 +119,7 @@ jobs:
118119
with:
119120
comment-summary-in-pr: on-failure
120121
fail-on-severity: critical
121-
- uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
122+
- uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
122123
if: github.event_name != 'merge_group'
123124
with:
124125
subject-name: ${{ env.REGISTRY }}/${{ github.repository }}-${{ matrix.flavor }}

0 commit comments

Comments
 (0)