Skip to content

Commit f15e6f8

Browse files
authored
Merge pull request #313 from arnested/action-updates
Update actions
2 parents 0586252 + f81a4e3 commit f15e6f8

File tree

6 files changed

+21
-32
lines changed

6 files changed

+21
-32
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permissions:
66
jobs:
77
go-version:
88
name: Lookup go versions
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
outputs:
1111
minimal: ${{ steps.go-version.outputs.minimal }}
1212
matrix: ${{ steps.go-version.outputs.matrix }}
@@ -17,26 +17,19 @@ jobs:
1717
go_generate:
1818
name: Check generated code is up to date
1919
needs: go-version
20-
runs-on: ubuntu-22.04
21-
env:
22-
workdir: go/src/${{ github.repository }}
20+
runs-on: ubuntu-24.04
2321
steps:
2422
- uses: actions/checkout@v6
25-
with:
26-
path: ${{env.workdir}}
2723
- name: Install Go ${{ needs.go-version.outputs.minimal }}
28-
uses: WillAbides/setup-go[email protected]
24+
uses: actions/setup-go@v6
2925
with:
3026
go-version: ${{ needs.go-version.outputs.minimal }}
3127
- run: go version
3228
- name: go generate
3329
env:
3430
GO111MODULE: 'on'
35-
GOPATH: ${{ github.workspace }}/go
36-
working-directory: ${{env.workdir}}
3731
run: go generate -x
3832
- name: Diff after go generate
39-
working-directory: ${{env.workdir}}
4033
run: git diff --exit-code
4134
build_and_test:
4235
name: Build and test
@@ -48,10 +41,9 @@ jobs:
4841
steps:
4942
- uses: actions/checkout@v6
5043
- name: Install Go ${{ matrix.go-version }}
51-
uses: WillAbides/setup-go[email protected]
44+
uses: actions/setup-go@v6
5245
with:
5346
go-version: ${{ matrix.go-version }}.x
54-
ignore-local: true
5547
- run: go version
5648
- name: go test
5749
env:

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permissions:
66

77
jobs:
88
dependency-review:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: 'Checkout Repository'
1212
uses: actions/checkout@v6

.github/workflows/docker-image-security-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
security-scan:
88
name: Docker build and scan
99
if: '!github.event.deleted'
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v6
1313
- name: Set up Docker Buildx

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
jobs:
88
dockerfile:
99
name: dockerfile
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v6
1313
- name: Run hadolint
@@ -17,21 +17,21 @@ jobs:
1717

1818
markdownlint:
1919
name: markdown
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
steps:
2222
- uses: actions/checkout@v6
2323
- name: Run markdownlint
2424
uses: DavidAnson/markdownlint-cli2-action@v21
2525

2626
golangci:
2727
name: lint
28-
runs-on: ubuntu-22.04
28+
runs-on: ubuntu-24.04
2929
steps:
3030
- uses: actions/checkout@v6
3131
- uses: arnested/go-version-action@v1
3232
id: go-version
3333
- name: Install Go ${{ steps.go-version.outputs.minimal }}
34-
uses: WillAbides/setup-go[email protected]
34+
uses: actions/setup-go@v6
3535
with:
3636
go-version: ${{ steps.go-version.outputs.minimal }}
3737
- run: go version

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
actions: read
1414
jobs:
1515
bump-version:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- uses: actions/checkout@v6
1919
with:
@@ -29,10 +29,9 @@ jobs:
2929
DEFAULT_BUMP: patch
3030
DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
3131
- name: Set up Go ${{ steps.go-version.outputs.latest }}
32-
uses: WillAbides/setup-go[email protected]
32+
uses: actions/setup-go@v6
3333
with:
3434
go-version: ${{ steps.go-version.outputs.latest }}.x
35-
ignore-local: true
3635
- run: go version
3736
- name: Install changelog management tool
3837
run: go install github.com/goreleaser/chglog/cmd/chglog@main
@@ -95,7 +94,7 @@ jobs:
9594
message: "Released `${{ github.repository }}`@`${{ github.sha }}` as ${{ steps.version.outputs.tag }}: *${{ job.status }}*."
9695
docker-build:
9796
name: Docker build and push
98-
runs-on: ubuntu-22.04
97+
runs-on: ubuntu-24.04
9998
steps:
10099
- uses: actions/checkout@v6
101100
- name: Set up Docker Buildx

.github/workflows/security.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
gosec:
1818
name: Golang Security Checker
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
env:
2121
GO111MODULE: on
2222
steps:
@@ -33,23 +33,21 @@ jobs:
3333
sarif_file: results.sarif
3434
govulncheck:
3535
name: Govulncheck
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-24.04
3737
steps:
3838
- uses: actions/checkout@v6
39-
- uses: arnested/go-version-action@v1
40-
id: go-version
39+
- name: Setup Go
40+
uses: actions/setup-go@v6
4141
with:
42-
patch-level: true
42+
go-version-file: go.mod
4343
- id: govulncheck
44-
uses: golang/govulncheck-action@master
44+
uses: arnested/govulncheck-action@main
4545
with:
46-
go-version-input: ${{ steps.go-version.outputs.latest }}
4746
output-format: sarif
4847
output-file: results.sarif
48+
setup-go: false
4949
repo-checkout: false
50-
- name: Fix SARIF format
51-
run: yq --inplace --output-format json '.runs |= map ({"results":[]} + .)' results.sarif
52-
- name: Upload SARIF file
50+
- name: Upload SARIF file
5351
uses: github/codeql-action/upload-sarif@v4
5452
with:
5553
sarif_file: results.sarif

0 commit comments

Comments
 (0)