Skip to content

Commit 40fd228

Browse files
rjaegersrjaegers
authored
Merge branch 'main' into feature/remove-docker-cli
2 parents 21e5de0 + fcc3527 commit 40fd228

11 files changed

+69
-36
lines changed

‎.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
"[email protected]",
99
"[email protected]",
10-
"[email protected].2490",
10+
"[email protected].2500",
1111
"[email protected]",
1212
"[email protected]"
1313
]

‎.github/workflows/continuous-integration.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ permissions: {}
1616
jobs:
1717
build-push-test:
1818
uses: ./.github/workflows/wc-build-push-test.yml
19-
secrets: inherit
19+
secrets:
20+
TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
21+
TEST_GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
22+
TEST_GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
23+
TEST_GITHUB_TOTP_SECRET: ${{ secrets.TEST_GITHUB_TOTP_SECRET }}
2024
permissions:
2125
actions: read
2226
attestations: write

‎.github/workflows/pr-conventional-title.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
doesn't start with an uppercase character.
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32-
- uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db # v2.9.2
32+
- uses: marocchino/sticky-pull-request-comment@d2ad0de260ae8b0235ce059e63f2949ba9e05943 # v2.9.3
3333
if: always() && steps.pr-title.outputs.error_message != null
3434
with:
3535
header: pr-title-lint-error
@@ -43,7 +43,7 @@ jobs:
4343
${{ steps.pr-title.outputs.error_message }}
4444
4545
- if: steps.pr-title.outputs.error_message == null
46-
uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db # v2.9.2
46+
uses: marocchino/sticky-pull-request-comment@d2ad0de260ae8b0235ce059e63f2949ba9e05943 # v2.9.3
4747
with:
4848
header: pr-title-lint-error
4949
delete: true

‎.github/workflows/release-build.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ permissions: {}
1717
jobs:
1818
build-push-test:
1919
uses: ./.github/workflows/wc-build-push-test.yml
20-
secrets: inherit
20+
secrets:
21+
TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
22+
TEST_GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
23+
TEST_GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
24+
TEST_GITHUB_TOTP_SECRET: ${{ secrets.TEST_GITHUB_TOTP_SECRET }}
2125
permissions:
2226
actions: read
2327
attestations: write
@@ -31,6 +35,8 @@ jobs:
3135
enable-cache: false
3236
apply-release-notes-template:
3337
runs-on: ubuntu-latest
38+
permissions:
39+
contents: write
3440
steps:
3541
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
3642
with:
@@ -54,6 +60,8 @@ jobs:
5460
matrix:
5561
flavor: [cpp, rust]
5662
runs-on: ubuntu-latest
63+
permissions:
64+
contents: write
5765
needs: [build-push-test, apply-release-notes-template]
5866
env:
5967
CONTAINER_FLAVOR: ${{ matrix.flavor }}

‎.github/workflows/update-dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
contents: write
2222
pull-requests: write
2323
steps:
24-
- uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
24+
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
2525
with:
2626
egress-policy: audit
2727
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/vulnerability-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
2121
with:
2222
egress-policy: audit
23-
- uses: crazy-max/ghaction-container-scan@74ce8ef8146e9632a852a8f79744bbcab1a527ee # v3.1.0
23+
- uses: crazy-max/ghaction-container-scan@4d8e0acba576e46016cbd65b9ecfc604e85e3990 # v3.2.0
2424
id: scan
2525
with:
2626
image: ghcr.io/${{ github.repository }}-${{ matrix.flavor }}:latest

‎.github/workflows/wc-acceptance-test.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ on:
77
flavor:
88
required: true
99
type: string
10+
secrets:
11+
TEST_GITHUB_TOKEN:
12+
required: true
13+
TEST_GITHUB_USER:
14+
required: true
15+
TEST_GITHUB_PASSWORD:
16+
required: true
17+
TEST_GITHUB_TOTP_SECRET:
18+
required: true
1019

1120
concurrency:
1221
group: ${{ github.workflow }}

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ on:
88
required: false
99
type: boolean
1010
default: true
11+
secrets:
12+
TEST_GITHUB_TOKEN:
13+
required: true
14+
TEST_GITHUB_USER:
15+
required: true
16+
TEST_GITHUB_PASSWORD:
17+
required: true
18+
TEST_GITHUB_TOTP_SECRET:
19+
required: true
1120

1221
permissions:
1322
contents: read
@@ -37,7 +46,7 @@ jobs:
3746
needs: build-push
3847
if: github.event_name == 'pull_request'
3948
steps:
40-
- uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
49+
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
4150
with:
4251
egress-policy: audit
4352
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -55,7 +64,6 @@ jobs:
5564
runner: ["ubuntu-latest", "ubuntu-24.04-arm"]
5665
needs: build-push
5766
uses: ./.github/workflows/wc-integration-test.yml
58-
secrets: inherit
5967
with:
6068
flavor: ${{ matrix.flavor }}
6169
runner: ${{ matrix.runner }}
@@ -66,7 +74,11 @@ jobs:
6674
flavor: [cpp]
6775
needs: build-push
6876
uses: ./.github/workflows/wc-acceptance-test.yml
69-
secrets: inherit
77+
secrets:
78+
TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
79+
TEST_GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
80+
TEST_GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
81+
TEST_GITHUB_TOTP_SECRET: ${{ secrets.TEST_GITHUB_TOTP_SECRET }}
7082
with:
7183
flavor: ${{ matrix.flavor }}
7284

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
persist-credentials: false
37-
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
37+
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
3838
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
3939
with:
4040
registry: ${{ env.REGISTRY }}
@@ -108,7 +108,7 @@ jobs:
108108
path: ${{ runner.temp }}/digests
109109
pattern: digests-${{ inputs.flavor }}-*
110110
merge-multiple: true
111-
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
111+
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
112112
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
113113
with:
114114
registry: ${{ env.REGISTRY }}
@@ -165,7 +165,7 @@ jobs:
165165
with:
166166
from-container: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.flavor }}:edge
167167
to-container: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.flavor }}:${{ steps.metadata.outputs.version }}
168-
- uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db # v2.9.2
168+
- uses: marocchino/sticky-pull-request-comment@d2ad0de260ae8b0235ce059e63f2949ba9e05943 # v2.9.3
169169
with:
170170
header: container-size-diff-${{ inputs.flavor }}
171171
message: |

‎package-lock.json‎

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)