Skip to content

Commit f7de13d

Browse files
rjaegersrjaegers
authored
Merge branch 'main' into dependabot/devcontainers/ghcr.io/devcontainers/features/github-cli-1.0.15
2 parents e3dbd9b + 46d7ee5 commit f7de13d

File tree

10 files changed

+16
-21
lines changed

10 files changed

+16
-21
lines changed

‎.devcontainer/cpp/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ubuntu:24.04@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8 AS extractor
3+
FROM ubuntu:24.04@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc AS extractor
44

55
ARG BATS_CORE_VERSION=1.12.0
66
ARG BATS_SUPPORT_VERSION=0.3.0
@@ -17,7 +17,7 @@ RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
1717
&& tar xzf /bats-support.tar.gz && mv bats-support-*/ bats-support \
1818
&& tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert
1919

20-
FROM ubuntu:24.04@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8
20+
FROM ubuntu:24.04@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc
2121

2222
ARG CCACHE_VERSION=4.12
2323
ARG CLANG_VERSION=18

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"[email protected]",
1010
"[email protected]",
1111
"[email protected]",
12-
"ms-vscode.cpptools@1.26.5",
12+
"ms-vscode.cpptools@1.27.7",
1313
"[email protected]",
14-
"sonarsource.sonarlint-vscode@4.30.0"
14+
"sonarsource.sonarlint-vscode@4.31.0"
1515
],
1616
"settings": {
1717
"C_Cpp.intelliSenseEngine": "disabled",

‎.devcontainer/cpp/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
},
3232
"extensions": [
3333
"[email protected]",
34-
"github.copilot@1.368.0",
34+
"github.copilot@1.372.0",
3535
"[email protected]",
36-
"[email protected].0",
36+
"[email protected].1",
3737
"[email protected]",
3838
"[email protected]",
3939
"[email protected]",
4040
"[email protected]",
4141
"[email protected]",
4242
"[email protected]",
43-
"ms-vscode.cpptools@1.26.5",
44-
"sonarsource.sonarlint-vscode@4.30.0",
43+
"ms-vscode.cpptools@1.27.7",
44+
"sonarsource.sonarlint-vscode@4.31.0",
4545
"[email protected]"
4646
]
4747
}

‎.devcontainer/rust/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ubuntu:24.04@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8 AS extractor
3+
FROM ubuntu:24.04@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc AS extractor
44

55
ARG BATS_CORE_VERSION=1.12.0
66
ARG BATS_SUPPORT_VERSION=0.3.0
@@ -17,7 +17,7 @@ RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
1717
&& tar xzf /bats-support.tar.gz && mv bats-support-*/ bats-support \
1818
&& tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert
1919

20-
FROM ubuntu:24.04@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8
20+
FROM ubuntu:24.04@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc
2121

2222
ARG CARGO_BINSTALL_VERSION=1.15.1
2323
ARG RUST_VERSION=1.89.0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"g++-14": "14.2.0-4ubuntu2~24.04",
55
"git": "1:2.43.0-1ubuntu7.3",
66
"gnupg2": "2.4.4-2ubuntu17.3",
7-
"libc6-dev": "2.39-0ubuntu8.5",
87
"rustup": "1.26.0-5build1",
98
"udev": "255.4-1ubuntu8.10",
109
"wget": "1.21.4-1ubuntu4.1",

‎.devcontainer/rust/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
"files.trimTrailingWhitespace": true
1515
},
1616
"extensions": [
17-
"github.copilot@1.368.0",
17+
"github.copilot@1.372.0",
1818
"[email protected]",
19-
"[email protected].0",
19+
"[email protected].1",
2020
"[email protected]",
2121
"[email protected]",
2222
"[email protected]",
2323
"[email protected]",
2424
"[email protected]",
25-
"sonarsource.sonarlint-vscode@4.30.0",
25+
"sonarsource.sonarlint-vscode@4.31.0",
2626
"[email protected]",
2727
"[email protected]"
2828
]

‎.github/workflows/image-cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# to delete untagged and orphaned images
1717
packages: write
1818
steps:
19-
- uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
19+
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
2020
with:
2121
disable-sudo: true
2222
egress-policy: block

‎.github/workflows/linting-formatting.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
persona: pedantic
3939
# flavors/dotnet is the smallest flavor of MegaLinter that contains the linters
4040
# we are interested in.
41-
- uses: oxsecurity/megalinter/flavors/dotnet@e08c2b05e3dbc40af4c23f41172ef1e068a7d651 # v8.8.0
41+
- uses: oxsecurity/megalinter/flavors/dotnet@0dcbedd66ea456ba2d54fd350affaa15df8a0da3 # v9.0.1
4242
env:
4343
APPLY_FIXES: all
4444
VALIDATE_ALL_CODEBASE: true

‎.github/workflows/wc-build-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
header: container-size-diff-${{ inputs.flavor }}
189189
message: |
190190
${{ steps.container-size-diff.outputs.size-diff-markdown }}
191-
- uses: anchore/sbom-action@da167eac915b4e86f08b264dbdbc867b61be6f0c # v0.20.5
191+
- uses: anchore/sbom-action@f8bdd1d8ac5e901a77a92f111440fdb1b593736b # v0.20.6
192192
with:
193193
image: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.flavor }}@${{ steps.inspect-manifest.outputs.digest }}
194194
dependency-snapshot: true

‎.mega-linter.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,3 @@ FILTER_REGEX_EXCLUDE: (CHANGELOG.md|package-lock.json)
2525
# hence the exclusion
2626
JSON_V8R_FILTER_REGEX_EXCLUDE: (\.vscode)
2727
REPOSITORY_TRIVY_ARGUMENTS: --ignorefile .github/linters/.trivyignore.yml
28-
# Temporarily disable hadolint errors as version v2.13.1
29-
# (https://github.com/hadolint/hadolint/issues/985) is
30-
# not yet part of megalinter
31-
DOCKERFILE_HADOLINT_DISABLE_ERRORS: true

0 commit comments

Comments
 (0)