Skip to content

Commit cbe4889

Browse files
authored
Merge branch 'main' into artefact_dl_options
2 parents 8f94bd8 + c11a081 commit cbe4889

18 files changed

+78
-59
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
NEW_GO_VERSION=$(cat .github/workflows/build-and-test.yml | grep '^ go_version:' | awk '{ print $2 }' | tr -d '"')
4141
echo "go_version=$NEW_GO_VERSION" >> $GITHUB_ENV
4242
- name: Set up Go
43-
uses: actions/setup-go@v5
43+
uses: actions/setup-go@v6
4444
with:
4545
go-version: ${{ env.go_version }}
4646

@@ -71,12 +71,12 @@ jobs:
7171
working-directory: ${{ matrix.go-module }}
7272
- if: ${{ startsWith(matrix.os, 'ubuntu') }}
7373
name: Linting
74-
uses: golangci/golangci-lint-action@v6
74+
uses: golangci/golangci-lint-action@v8
7575
with:
7676
# Required: the version of golangci-lint is required and must be specified without patch version.
7777
version: latest
7878
working-directory: ${{ matrix.go-module }}
79-
args: "--verbose --print-issued-lines --print-linter-name --out-${NO_FUTURE}format colored-line-number --timeout 300s --max-issues-per-linter 0 --max-same-issues 0"
79+
args: "--verbose --output.text.print-issued-lines --output.text.print-linter-name --output.tab.colors --max-issues-per-linter 0 --max-same-issues 0"
8080
- name: Test ${{ matrix.go-module }} on ${{ matrix.os }}
8181
run: go test -race -cover -v ./...
8282
working-directory: ${{ matrix.go-module }}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v5
2929
with:
3030
fetch-depth: 0
31-
- uses: actions/setup-python@v5
31+
- uses: actions/setup-python@v6
3232
with:
3333
python-version: ${{ env.python_version }}
3434
- name: Install CI/CD tools
@@ -47,7 +47,7 @@ jobs:
4747
name: Check for secrets
4848
runs-on: ubuntu-latest
4949
steps:
50-
- uses: actions/setup-python@v5
50+
- uses: actions/setup-python@v6
5151
- name: Install tools
5252
run: pip install detect-secrets==1.0.3 && pip list
5353
- uses: actions/checkout@v5

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161

6262
# Initializes the CodeQL tools for scanning.
6363
- name: Initialize CodeQL
64-
uses: github/codeql-action/init@v3
64+
uses: github/codeql-action/init@v4
6565
with:
6666
languages: ${{ matrix.language }}
6767
build-mode: ${{ matrix.build-mode }}
@@ -89,6 +89,6 @@ jobs:
8989
exit 1
9090
9191
- name: Perform CodeQL Analysis
92-
uses: github/codeql-action/analyze@v3
92+
uses: github/codeql-action/analyze@v4
9393
with:
9494
category: "/language:${{matrix.language}}"

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v5
2525
with:
2626
fetch-depth: 0
27-
- uses: actions/setup-python@v5
27+
- uses: actions/setup-python@v6
2828
with:
2929
python-version: ${{ env.python_version }}
3030
- uses: FranzDiebold/github-env-vars-action@v2

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
# Get the full history as this is required by goreleaser
3939
fetch-depth: 0
4040
- name: Set up Go
41-
uses: actions/setup-go@v5
41+
uses: actions/setup-go@v6
4242
with:
4343
go-version: ${{ env.go_version }}
4444
- name: Setup python
45-
uses: actions/setup-python@v5
45+
uses: actions/setup-python@v6
4646
with:
4747
python-version: ${{ env.python_version }}
4848
- uses: FranzDiebold/github-env-vars-action@v2

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: "Run analysis"
40-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
40+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
4141
with:
4242
results_file: results.sarif
4343
results_format: 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@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
71+
uses: github/codeql-action/upload-sarif@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
7272
with:
7373
sarif_file: results.sarif

.github/workflows/update-utils.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
token: ${{ secrets.GIT_SECRET }}
2626
ref: ${{ inputs.branch || github.head_ref || github.ref }}
2727
- name: Setup python
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: ${{ env.python_version }}
3131
- name: Install continuous-delivery-scripts

.golangci.yaml

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,65 @@
1+
version: "2"
12
run:
2-
timeout: 10m
3-
4-
# Run linters over integration tests
53
build-tags:
64
- integration
7-
85
linters:
9-
disable-all: true # Disable defaults, then enable the ones we want
6+
default: none
107
enable:
8+
- bodyclose
119
- errcheck
12-
- gosimple
10+
- gocritic
11+
- gosec
1312
- govet
1413
- ineffassign
14+
- misspell
15+
- revive
1516
- staticcheck
16-
- typecheck
17+
- unconvert
1718
- unused
18-
- bodyclose
19-
- stylecheck
20-
- gosec
21-
- goimports
19+
settings:
20+
misspell:
21+
locale: UK
22+
extra-words:
23+
- typo: sanetisation
24+
correction: sanitisation
25+
- typo: sanetise
26+
correction: sanitise
27+
- typo: sanetising
28+
correction: sanitising
29+
revive:
30+
rules:
31+
- name: exported
32+
arguments:
33+
- disableStutteringCheck
34+
severity: warning
35+
disabled: false
36+
exclusions:
37+
generated: lax
38+
presets:
39+
- comments
40+
- common-false-positives
41+
- legacy
42+
- std-error-handling
43+
paths:
44+
- third_party$
45+
- builtin$
46+
- examples$
47+
formatters:
48+
enable:
2249
- gci
23-
- revive
24-
- gocritic
25-
- unconvert
26-
- misspell
27-
28-
linters-settings:
29-
goimports:
30-
local-prefixes: github.com/ARM-software
31-
gci:
32-
sections:
33-
- Standard
34-
- Default
35-
- Prefix(github.com/ARM-software)
36-
revive:
37-
rules:
38-
- name: exported
39-
severity: warning
40-
disabled: false
41-
arguments:
42-
- "disableStutteringCheck"
43-
misspell:
44-
locale: UK
45-
extra-words:
46-
- typo: "sanetisation"
47-
correction: "sanitisation"
48-
- typo: "sanetise"
49-
correction: "sanitise"
50-
- typo: "sanetising"
51-
correction: "sanitising"
50+
- goimports
51+
settings:
52+
gci:
53+
sections:
54+
- Standard
55+
- Default
56+
- Prefix(github.com/ARM-software)
57+
goimports:
58+
local-prefixes:
59+
- github.com/ARM-software
60+
exclusions:
61+
generated: lax
62+
paths:
63+
- third_party$
64+
- builtin$
65+
- examples$

changes/20250904170525.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dependency upgrade: setup-go-6

changes/20250904170532.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dependency upgrade: setup-python-6

0 commit comments

Comments
 (0)