Skip to content

Commit ee85adc

Browse files
authored
Merge branch 'main' into feature/amp-devcontainer-rust/update-vscode-extensions
2 parents 5d27cf3 + 9c221de commit ee85adc

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

.devcontainer/cpp/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cmake==4.0.3
2-
conan==2.18.1
2+
conan==2.19.1
33
gcovr==8.3

.devcontainer/cpp/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ colorlog==6.8.2 \
144144
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
145145
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
146146
# via gcovr
147-
conan==2.18.1 \
148-
--hash=sha256:5d8e9fac7614de9297933f65de8f17db14851a871cebc962f4856b7c294f43c5
147+
conan==2.19.1 \
148+
--hash=sha256:bf334867b81bcb73e5be31afe26a0f207017719298ad1f0f64762867caa9a971
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \

.github/workflows/linting-formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
APPLY_FIXES: all
4444
VALIDATE_ALL_CODEBASE: true
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46-
- uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
46+
- uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
4747
if: success() || failure()
4848
with:
4949
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
@@ -31,6 +31,6 @@ jobs:
3131
results_format: sarif
3232
repo_token: ${{ secrets.SCORECARD_TOKEN }}
3333
publish_results: true
34-
- uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
34+
- uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
3535
with:
3636
sarif_file: results.sarif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
disable-sudo: true
2525
egress-policy: audit
26-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
26+
- uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
2727
with:
2828
registry: ${{ env.REGISTRY }}
2929
username: ${{ github.actor }}

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
with:
2525
persist-credentials: false
26-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
26+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
2727
id: token
2828
with:
2929
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}

.github/workflows/update-dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
id: update-packages
3232
with:
3333
input-file: .devcontainer/${{ matrix.flavor }}/apt-requirements-*.json
34-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
34+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
3535
id: token
3636
with:
3737
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
@@ -63,7 +63,7 @@ jobs:
6363
id: update-extensions
6464
with:
6565
input-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata-vscode.json
66-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
66+
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
6767
id: token
6868
with:
6969
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}

.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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
28+
- uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
2929
if: steps.scan.outputs.sarif != ''
3030
with:
3131
sarif_file: ${{ steps.scan.outputs.sarif }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
with:
3737
persist-credentials: false
3838
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
39-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
39+
- uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
4040
with:
4141
registry: ${{ env.REGISTRY }}
4242
username: ${{ github.actor }}
4343
password: ${{ secrets.GITHUB_TOKEN }}
44-
- uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
44+
- uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
4545
env:
4646
DOCKER_METADATA_SET_OUTPUT_ENV: false
4747
id: metadata
@@ -112,12 +112,12 @@ jobs:
112112
pattern: digests-${{ inputs.flavor }}-*
113113
merge-multiple: true
114114
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
115-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
115+
- uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
116116
with:
117117
registry: ${{ env.REGISTRY }}
118118
username: ${{ github.actor }}
119119
password: ${{ secrets.GITHUB_TOKEN }}
120-
- uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
120+
- uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
121121
id: metadata
122122
env:
123123
DOCKER_METADATA_ANNOTATIONS_LEVELS: index
@@ -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@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2
191+
- uses: anchore/sbom-action@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
192192
with:
193193
image: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.flavor }}@${{ steps.inspect-manifest.outputs.digest }}
194194
dependency-snapshot: true

.github/workflows/wc-integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252
with:
5353
persist-credentials: false
54-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
54+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5555
if: inputs.flavor == 'cpp'
5656
with:
5757
path: test/cpp/.xwin-cache

0 commit comments

Comments
 (0)