Skip to content

Commit f906441

Browse files
authored
Merge branch 'main' into feature/reduce-unnecessary-copy-and-wget
Signed-off-by: Ron <45816308+rjaegers@users.noreply.github.com>
2 parents b9daef1 + 2cd0bad commit f906441

11 files changed

Lines changed: 123 additions & 118 deletions

.devcontainer/cpp/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ADD --checksum=sha256:a122d4080a26c1da986bd0e7202b1630eb661a624915ef244f496fdd30
3737
ADD https://github.com/bats-core/bats-support#v0.3.0 /
3838
ADD https://github.com/bats-core/bats-assert#v2.1.0 /
3939

40-
FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233 AS extractor
40+
FROM ubuntu:24.04@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f AS extractor
4141

4242
ARG XWIN_VERSION
4343

@@ -54,7 +54,7 @@ RUN --mount=from=downloader,target=/dl \
5454
&& tar xJf /dl/arm-gnu-toolchain.tar.xz --exclude='*arm-none-eabi-gdb*' --exclude='share' \
5555
&& mv arm-gnu-toolchain-*/ gcc-arm-none-eabi
5656

57-
FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
57+
FROM ubuntu:24.04@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f
5858

5959
ARG CCACHE_VERSION=4.11
6060
ARG CLANG_VERSION=18

.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.2",
88
"ninja-build": "1.11.1-2",
99
"python3-pip": "24.0+dfsg-1ubuntu1.1",
10-
"udev": "255.4-1ubuntu8.6",
10+
"udev": "255.4-1ubuntu8.8",
1111
"unzip": "6.0-28ubuntu4.1",
1212
"wget": "1.21.4-1ubuntu4.1",
1313
"xsltproc": "1.1.39-0exp1ubuntu0.24.04.2"

.devcontainer/cpp/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ pyyaml==6.0.2 \
391391
--hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
392392
--hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
393393
# via conan
394-
requests==2.32.3 \
395-
--hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
396-
--hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
394+
requests==2.32.4 \
395+
--hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
396+
--hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
397397
# via conan
398398
six==1.16.0 \
399399
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \

.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:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
1+
FROM ubuntu:24.04@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f
22

33
ARG BATS_VERSION=1.11.0
44
ARG CARGO_BINSTALL_VERSION=1.12.2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"gnupg2": "2.4.4-2ubuntu17.2",
77
"libc6-dev": "2.39-0ubuntu8.4",
88
"rustup": "1.26.0-5build1",
9-
"udev": "255.4-1ubuntu8.6",
9+
"udev": "255.4-1ubuntu8.8",
1010
"wget": "1.21.4-1ubuntu4.1",
1111
"xz-utils": "5.6.1+really5.4.5-1ubuntu0.2"
1212
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"extensions": [
88
"mhutchie.git-graph@1.30.0",
99
"ms-vsliveshare.vsliveshare@1.0.5948",
10-
"rust-lang.rust-analyzer@0.3.2474",
10+
"rust-lang.rust-analyzer@0.3.2490",
1111
"tamasfe.even-better-toml@0.21.2",
1212
"usernamehw.errorlens@3.26.0"
1313
]

.github/workflows/linting-formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
APPLY_FIXES: all
3232
VALIDATE_ALL_CODEBASE: true
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34-
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
34+
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
3535
if: success() || failure()
3636
with:
3737
sarif_file: megalinter-reports/megalinter-report.sarif

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
results_format: sarif
2828
repo_token: ${{ secrets.SCORECARD_TOKEN }}
2929
publish_results: true
30-
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
30+
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
3131
with:
3232
sarif_file: results.sarif

.github/workflows/vulnerability-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
image: ghcr.io/${{ github.repository }}-${{ matrix.flavor }}:latest
2424
dockerfile: .devcontainer/Dockerfile
25-
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
25+
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
2626
if: steps.scan.outputs.sarif != ''
2727
with:
2828
sarif_file: ${{ steps.scan.outputs.sarif }}

0 commit comments

Comments
 (0)