Skip to content

Commit b474837

Browse files
authored
Merge branch 'main' into feature/refactor-ci
2 parents 213a822 + 2cd0bad commit b474837

File tree

11 files changed

+122
-117
lines changed

11 files changed

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

33
ARG BATS_VERSION=1.11.0
44
ARG CCACHE_VERSION=4.11

.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
99
10-
10+
1111
1212
1313
]

.github/workflows/linting-formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
APPLY_FIXES: all
3636
VALIDATE_ALL_CODEBASE: true
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38-
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
38+
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
3939
if: success() || failure()
4040
with:
4141
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
@@ -30,6 +30,6 @@ jobs:
3030
results_format: sarif
3131
repo_token: ${{ secrets.SCORECARD_TOKEN }}
3232
publish_results: true
33-
- uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
33+
- uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
3434
with:
3535
sarif_file: results.sarif

.github/workflows/vulnerability-scan.yml

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

0 commit comments

Comments
 (0)