Skip to content

Commit 9e0159e

Browse files
committed
Merge origin/main into fix/1642-python-constructor-calls-init
Brings the branch up to date with main edc2301. Main only changed CI configuration since the branch base (CodeQL action, actions/attest and msys2/setup-msys2 pins, Dependabot grouping); no conflicts. Signed-off-by: Martin Vogel <[email protected]>
2 parents 0547190 + edc2301 commit 9e0159e

12 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
groups:
8+
# init and analyze must run the same CodeQL Action version within a job, and
9+
# upload-sarif is kept in step with them, so one PR bumps all three.
10+
codeql-action:
11+
patterns:
12+
- "github/codeql-action*"

‎.github/workflows/_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
steps:
121121
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
122122

123-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
123+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
124124
with:
125125
msystem: CLANG64
126126
path-type: inherit
@@ -182,7 +182,7 @@ jobs:
182182
steps:
183183
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
184184

185-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
185+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
186186
with:
187187
msystem: CLANGARM64
188188
path-type: inherit

‎.github/workflows/_memwaste.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
timeout-minutes: 90
150150
steps:
151151
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
152-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
152+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
153153
with:
154154
msystem: CLANG64
155155
path-type: inherit

‎.github/workflows/_smoke.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
go-version-file: pkg/go/go.mod
193193
cache: false
194194

195-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
195+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
196196
with:
197197
msystem: ${{ matrix.arch == 'arm64' && 'CLANGARM64' || 'CLANG64' }}
198198
path-type: inherit

‎.github/workflows/_soak.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
steps:
120120
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
121121

122-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
122+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
123123
with:
124124
msystem: CLANG64
125125
path-type: inherit
@@ -197,7 +197,7 @@ jobs:
197197
steps:
198198
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
199199

200-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
200+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
201201
with:
202202
msystem: CLANGARM64
203203
path-type: inherit
@@ -389,7 +389,7 @@ jobs:
389389
steps:
390390
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
391391

392-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
392+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
393393
with:
394394
msystem: CLANG64
395395
path-type: inherit

‎.github/workflows/_test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ jobs:
594594
# preflight script, so AV-interaction coverage lives there; runners run
595595
# without RTP by platform constraint.
596596

597-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
597+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
598598
with:
599599
msystem: ${{ matrix.msystem }}
600600
path-type: inherit
@@ -746,7 +746,7 @@ jobs:
746746
steps:
747747
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
748748

749-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
749+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
750750
with:
751751
msystem: CLANG64
752752
path-type: inherit

‎.github/workflows/bug-repro.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7171

72-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
72+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
7373
with:
7474
msystem: CLANG64
7575
path-type: inherit

‎.github/workflows/cache-warm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
steps:
8383
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8484

85-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
85+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
8686
with:
8787
msystem: CLANG64
8888
path-type: inherit

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
run: scripts/ci/codeql-retrace-vendored.sh "$RUNNER_TEMP/codeql-retrace.txt"
115115

116116
- name: Initialize CodeQL
117-
uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
117+
uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4
118118
with:
119119
languages: ${{ matrix.language }}
120120
build-mode: ${{ matrix.build-mode }}
@@ -129,7 +129,7 @@ jobs:
129129
run: scripts/build.sh --reuse-vendored --retrace-from "$RUNNER_TEMP/codeql-retrace.txt"
130130

131131
- name: Perform CodeQL Analysis
132-
uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
132+
uses: github/codeql-action/analyze@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4
133133
with:
134134
category: "/language:${{ matrix.language }}"
135135

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
if: matrix.os == 'macos-15'
220220
run: command -v ccache >/dev/null 2>&1 || brew install ccache
221221

222-
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2
222+
- uses: msys2/setup-msys2@ec48f7c5447b3140e2b088413ae3a55687bccb6e # v2
223223
if: matrix.os == 'windows-latest'
224224
with:
225225
msystem: CLANG64

0 commit comments

Comments
 (0)