Skip to content

Commit dbfb964

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/download-artifact-7.0.0
2 parents 4979c85 + b30b4ae commit dbfb964

25 files changed

+1340
-30
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
# we want the head of the branch that triggered this, not the reference of the commit, this is so we get updated go versions etc.
3333
- name: Check out [${{ inputs.branch || github.ref }}]
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
ref: ${{ inputs.branch || github.ref }}
3737
- name: Update Go env version

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
# Checkout with full history for to allow compare with base branch
30-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 0
3333
- uses: actions/setup-python@v6
@@ -52,7 +52,7 @@ jobs:
5252
- uses: actions/setup-python@v6
5353
- name: Install tools
5454
run: pip install detect-secrets[gibberish]==1.5.0 && pip list
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
with:
5757
fetch-depth: 0
5858
# FIXME: GitLeaks requires a licence now

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
needs: update-client
2222
steps:
2323
# Checkout with full history for to allow compare with base branch
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
with:
2626
fetch-depth: 0
2727
- uses: actions/setup-python@v6

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
outputs:
2020
changes: ${{ steps.check.outputs.changes }}
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- name: Check if changes directory contains files
2424
id: check
2525
run: |
@@ -33,7 +33,7 @@ jobs:
3333
needs: [ check-for-changes ]
3434
if: needs.check-for-changes.outputs.changes
3535
steps:
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737
with:
3838
# Get the full history as this is required by goreleaser
3939
fetch-depth: 0

.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.1
35+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.1.1
3636
with:
3737
persist-credentials: false
3838

@@ -59,7 +59,7 @@ jobs:
5959
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6060
# format to the repository Actions tab.
6161
- name: "Upload artifact"
62-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
62+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
6363
with:
6464
name: SARIF file
6565
path: results.sarif
@@ -68,6 +68,6 @@ jobs:
6868
# Upload the results to GitHub's code scanning dashboard (optional).
6969
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
71+
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
7272
with:
7373
sarif_file: results.sarif

.github/workflows/update-client.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout API-Uniform-Contract repo
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
with:
3232
token: ${{ secrets.GIT_SECRET }}
3333
repository: Arm-Debug/API-Uniform-Contract
3434
path: API-Uniform-Contract
3535
ref: main
3636
# FIXME set to `production`
37-
- uses: actions/upload-artifact@v5.0.0
37+
- uses: actions/upload-artifact@v6.0.0
3838
with:
3939
name: all-service-flat
4040
path: API-Uniform-Contract/all/1/
@@ -44,13 +44,13 @@ jobs:
4444
runs-on: ubuntu-latest
4545
needs: update-client
4646
steps:
47-
- uses: actions/checkout@v5
47+
- uses: actions/checkout@v6
4848
with:
4949
# So that we have correct GIT_TOKEN to push back to branch as we need workflow permissions
5050
token: ${{ secrets.GIT_SECRET }}
5151
ref: ${{ inputs.branch || github.head_ref || github.ref }}
5252
- name: Checkout Update Go action
53-
uses: actions/checkout@v5
53+
uses: actions/checkout@v6
5454
with:
5555
repository: Arm-Debug/update-go-action
5656
ref: refs/tags/latest
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install continuous-delivery-scripts
7676
run: |
7777
pip install continuous-delivery-scripts
78-
- uses: actions/checkout@v5
78+
- uses: actions/checkout@v6
7979
with:
8080
ref: ${{ inputs.branch || github.head_ref || github.ref }}
8181
- name: Download all-service-flat artefact
@@ -113,7 +113,7 @@ jobs:
113113
ls -l ${{ env.go_module }}/*
114114
- name: Upload extensions
115115
if: ${{ env.EXTENSIONS_EXISTS == 'true' }}
116-
uses: actions/upload-artifact@v5.0.0
116+
uses: actions/upload-artifact@v6.0.0
117117
with:
118118
name: extensions
119119
path: extensions/
@@ -155,7 +155,7 @@ jobs:
155155
needs:
156156
- build-and-test
157157
steps:
158-
- uses: actions/checkout@v5
158+
- uses: actions/checkout@v6
159159
- name: Trigger release
160160
if: contains(${{ inputs.branch || github.head_ref || github.ref }} , 'main')
161161
run: gh workflow run release.yml -f release_type=release

.secrets.baseline

Lines changed: 180 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@
132132
".*\\.properties$",
133133
"^\\.git[\\\\/]",
134134
".*go\\.sum$",
135-
".*codegen.*",
136-
"workflows/.*"
135+
"^workflows/.*"
137136
]
138137
}
139138
],
@@ -153,7 +152,7 @@
153152
"filename": "client/docs/FPGAJobsAPI.md",
154153
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
155154
"is_verified": false,
156-
"line_number": 204
155+
"line_number": 277
157156
}
158157
],
159158
"client/docs/WorkspaceAPI.md": [
@@ -164,7 +163,184 @@
164163
"is_verified": false,
165164
"line_number": 505
166165
}
166+
],
167+
"generator/codegen/testdata/collections/test-all-redacted.json": [
168+
{
169+
"type": "Hex High Entropy String",
170+
"filename": "generator/codegen/testdata/collections/test-all-redacted.json",
171+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
172+
"is_verified": false,
173+
"line_number": 1
174+
}
175+
],
176+
"generator/codegen/testdata/collections/test-some-redacted.json": [
177+
{
178+
"type": "Hex High Entropy String",
179+
"filename": "generator/codegen/testdata/collections/test-some-redacted.json",
180+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
181+
"is_verified": false,
182+
"line_number": 1
183+
}
184+
],
185+
"generator/codegen/testdata/collections/test-x-no-pagination.json": [
186+
{
187+
"type": "Base64 High Entropy String",
188+
"filename": "generator/codegen/testdata/collections/test-x-no-pagination.json",
189+
"hashed_secret": "923aa0e1ab5acd10fc414b54d9d53e3803948e89",
190+
"is_verified": false,
191+
"line_number": 1
192+
},
193+
{
194+
"type": "Hex High Entropy String",
195+
"filename": "generator/codegen/testdata/collections/test-x-no-pagination.json",
196+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
197+
"is_verified": false,
198+
"line_number": 1
199+
},
200+
{
201+
"type": "Base64 High Entropy String",
202+
"filename": "generator/codegen/testdata/collections/test-x-no-pagination.json",
203+
"hashed_secret": "b6c30ab47db0e58093620b979821ff3a0f14226d",
204+
"is_verified": false,
205+
"line_number": 1
206+
},
207+
{
208+
"type": "Base64 High Entropy String",
209+
"filename": "generator/codegen/testdata/collections/test-x-no-pagination.json",
210+
"hashed_secret": "fdde1bd360789412444733526da9cc4278c8242a",
211+
"is_verified": false,
212+
"line_number": 1
213+
}
214+
],
215+
"generator/codegen/testdata/collections/test.json": [
216+
{
217+
"type": "Hex High Entropy String",
218+
"filename": "generator/codegen/testdata/collections/test.json",
219+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
220+
"is_verified": false,
221+
"line_number": 1
222+
}
223+
],
224+
"generator/codegen/testdata/jobs/test-all-redacted.json": [
225+
{
226+
"type": "Base64 High Entropy String",
227+
"filename": "generator/codegen/testdata/jobs/test-all-redacted.json",
228+
"hashed_secret": "923aa0e1ab5acd10fc414b54d9d53e3803948e89",
229+
"is_verified": false,
230+
"line_number": 1
231+
},
232+
{
233+
"type": "Hex High Entropy String",
234+
"filename": "generator/codegen/testdata/jobs/test-all-redacted.json",
235+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
236+
"is_verified": false,
237+
"line_number": 1
238+
},
239+
{
240+
"type": "Base64 High Entropy String",
241+
"filename": "generator/codegen/testdata/jobs/test-all-redacted.json",
242+
"hashed_secret": "b6c30ab47db0e58093620b979821ff3a0f14226d",
243+
"is_verified": false,
244+
"line_number": 1
245+
},
246+
{
247+
"type": "Base64 High Entropy String",
248+
"filename": "generator/codegen/testdata/jobs/test-all-redacted.json",
249+
"hashed_secret": "fdde1bd360789412444733526da9cc4278c8242a",
250+
"is_verified": false,
251+
"line_number": 1
252+
}
253+
],
254+
"generator/codegen/testdata/jobs/test-some-redacted.json": [
255+
{
256+
"type": "Base64 High Entropy String",
257+
"filename": "generator/codegen/testdata/jobs/test-some-redacted.json",
258+
"hashed_secret": "923aa0e1ab5acd10fc414b54d9d53e3803948e89",
259+
"is_verified": false,
260+
"line_number": 1
261+
},
262+
{
263+
"type": "Hex High Entropy String",
264+
"filename": "generator/codegen/testdata/jobs/test-some-redacted.json",
265+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
266+
"is_verified": false,
267+
"line_number": 1
268+
},
269+
{
270+
"type": "Base64 High Entropy String",
271+
"filename": "generator/codegen/testdata/jobs/test-some-redacted.json",
272+
"hashed_secret": "b6c30ab47db0e58093620b979821ff3a0f14226d",
273+
"is_verified": false,
274+
"line_number": 1
275+
},
276+
{
277+
"type": "Base64 High Entropy String",
278+
"filename": "generator/codegen/testdata/jobs/test-some-redacted.json",
279+
"hashed_secret": "fdde1bd360789412444733526da9cc4278c8242a",
280+
"is_verified": false,
281+
"line_number": 1
282+
}
283+
],
284+
"generator/codegen/testdata/jobs/test.json": [
285+
{
286+
"type": "Base64 High Entropy String",
287+
"filename": "generator/codegen/testdata/jobs/test.json",
288+
"hashed_secret": "923aa0e1ab5acd10fc414b54d9d53e3803948e89",
289+
"is_verified": false,
290+
"line_number": 1
291+
},
292+
{
293+
"type": "Hex High Entropy String",
294+
"filename": "generator/codegen/testdata/jobs/test.json",
295+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
296+
"is_verified": false,
297+
"line_number": 1
298+
},
299+
{
300+
"type": "Base64 High Entropy String",
301+
"filename": "generator/codegen/testdata/jobs/test.json",
302+
"hashed_secret": "b6c30ab47db0e58093620b979821ff3a0f14226d",
303+
"is_verified": false,
304+
"line_number": 1
305+
},
306+
{
307+
"type": "Base64 High Entropy String",
308+
"filename": "generator/codegen/testdata/jobs/test.json",
309+
"hashed_secret": "fdde1bd360789412444733526da9cc4278c8242a",
310+
"is_verified": false,
311+
"line_number": 1
312+
}
313+
],
314+
"generator/codegen/testdata/linkfollowers/test.json": [
315+
{
316+
"type": "Base64 High Entropy String",
317+
"filename": "generator/codegen/testdata/linkfollowers/test.json",
318+
"hashed_secret": "923aa0e1ab5acd10fc414b54d9d53e3803948e89",
319+
"is_verified": false,
320+
"line_number": 1
321+
},
322+
{
323+
"type": "Hex High Entropy String",
324+
"filename": "generator/codegen/testdata/linkfollowers/test.json",
325+
"hashed_secret": "a971ecb6f8d59edcdb891d80bc3965504aa1f6ec",
326+
"is_verified": false,
327+
"line_number": 1
328+
},
329+
{
330+
"type": "Base64 High Entropy String",
331+
"filename": "generator/codegen/testdata/linkfollowers/test.json",
332+
"hashed_secret": "b6c30ab47db0e58093620b979821ff3a0f14226d",
333+
"is_verified": false,
334+
"line_number": 1
335+
},
336+
{
337+
"type": "Base64 High Entropy String",
338+
"filename": "generator/codegen/testdata/linkfollowers/test.json",
339+
"hashed_secret": "fdde1bd360789412444733526da9cc4278c8242a",
340+
"is_verified": false,
341+
"line_number": 1
342+
}
167343
]
168344
},
169-
"generated_at": "2025-10-17T16:43:56Z"
345+
"generated_at": "2025-12-23T16:24:30Z"
170346
}

0 commit comments

Comments
 (0)