Skip to content

Commit 060c81e

Browse files
committed
chore: tidy and bump workflow deps
Signed-off-by: Bence Csati <bence.csati@axoflow.com>
1 parent ff4051f commit 060c81e

File tree

4 files changed

+65
-51
lines changed

4 files changed

+65
-51
lines changed

.github/workflows/artifacts.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ jobs:
4949

5050
steps:
5151
- name: Checkout repository
52-
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
52+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5353

5454
- name: Set up QEMU
55-
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
55+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
5656

5757
- name: Set up Docker Buildx
58-
uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 # v2.9.1
58+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
5959

6060
- name: Set image name
6161
id: image-name
6262
run: echo "value=ghcr.io/${{ github.repository }}" >> "$GITHUB_OUTPUT"
6363

6464
- name: Gather build metadata
6565
id: meta
66-
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0
66+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
6767
with:
6868
images: ${{ steps.image-name.outputs.value }}
6969
flavor: |
@@ -75,15 +75,15 @@ jobs:
7575
# Multiple exporters are not supported yet
7676
# See https://github.com/moby/buildkit/pull/2760
7777
- name: Determine build output
78-
uses: haya14busa/action-cond@1d6e8a12b20cdb4f1954feef9aa475b9c390cab5 # v1.1.1
78+
uses: haya14busa/action-cond@94f77f7a80cd666cb3155084e428254fea4281fd # v1.2.1
7979
id: build-output
8080
with:
8181
cond: ${{ inputs.publish }}
8282
if_true: type=image,push=true
8383
if_false: type=oci,dest=image.tar
8484

8585
- name: Login to GitHub Container Registry
86-
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
86+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
8787
with:
8888
registry: ghcr.io
8989
username: ${{ github.actor }}
@@ -92,7 +92,7 @@ jobs:
9292

9393
- name: Build and push image
9494
id: build
95-
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
95+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
9696
with:
9797
context: .
9898
platforms: linux/amd64,linux/arm64
@@ -116,21 +116,23 @@ jobs:
116116
tar -xf image.tar -C image
117117
118118
- name: Run Trivy vulnerability scanner
119-
uses: aquasecurity/trivy-action@41f05d9ecffa2ed3f1580af306000f734b733e54 # 0.11.2
119+
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # 0.29.0
120+
env:
121+
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
122+
TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db:1
120123
with:
121124
input: image
122125
format: sarif
123126
output: trivy-results.sarif
124127

125128
- name: Upload Trivy scan results as artifact
126-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
129+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
127130
with:
128131
name: "[${{ github.job }}] Trivy scan results"
129132
path: trivy-results.sarif
130133
retention-days: 5
131134

132135
- name: Upload Trivy scan results to GitHub Security tab
133-
uses: github/codeql-action/upload-sarif@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0
136+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
134137
with:
135138
sarif_file: trivy-results.sarif
136-

.github/workflows/go-lint-and-test.yml

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,64 @@ on:
77
branches: [ main ]
88

99
jobs:
10-
check-license:
11-
name: Check licenses
10+
license-check:
11+
name: License check
1212
runs-on: ubuntu-latest
13+
1314
steps:
14-
- name: Set up Go
15-
uses: actions/setup-go@v3
16-
with:
17-
go-version: '1.23'
18-
- name: Check out code
19-
uses: actions/checkout@v3
20-
- name: Cache licenses
21-
uses: actions/cache@v3
22-
with:
23-
key: licensei-cache-${{ hashFiles('go.sum') }}
24-
path: ".licensei.cache"
25-
restore-keys: licensei-cache
26-
- name: Ensure licensei cache
27-
env:
28-
GITHUB_TOKEN: ${{ github.token }}
29-
run: make .licensei.cache
30-
- name: Run license check
31-
run: make check-license
15+
- name: Checkout code
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
18+
- name: Set up Go
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
20+
with:
21+
go-version-file: '.go-version'
22+
23+
- name: Cache licenses
24+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
25+
with:
26+
key: licensei-cache-${{ hashFiles('go.sum') }}
27+
path: ".licensei.cache"
28+
restore-keys: licensei-cache
29+
30+
- name: Ensure licensei cache
31+
env:
32+
GITHUB_TOKEN: ${{ github.token }}
33+
run: make .licensei.cache
34+
35+
- name: Run license check
36+
run: make check-license
3237

3338
run-test:
3439
name: Go tests
3540
runs-on: ubuntu-latest
41+
3642
steps:
37-
- name: Set up Go
38-
uses: actions/setup-go@v3
39-
with:
40-
go-version: '1.23'
41-
- name: Check out code
42-
uses: actions/checkout@v3
43-
- name: Run tests
44-
run: make test
43+
- name: Checkout code
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
45+
46+
- name: Set up Go
47+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
48+
with:
49+
go-version-file: '.go-version'
50+
51+
- name: Run tests
52+
run: make test
4553

4654
run-lint:
4755
name: Go lint
4856
runs-on: ubuntu-latest
57+
4958
steps:
50-
- name: Set up Go
51-
uses: actions/setup-go@v3
52-
with:
53-
go-version: '1.23'
54-
- name: Check out code
55-
uses: actions/checkout@v3
56-
- name: Run lint
57-
run: make lint
58-
env:
59-
LINTER_FLAGS: '--timeout 5m'
59+
- name: Checkout code
60+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61+
62+
- name: Set up Go
63+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
64+
with:
65+
go-version-file: '.go-version'
66+
67+
- name: Lint
68+
run: make lint
69+
env:
70+
LINTER_FLAGS: '--timeout 5m'

.go-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.23.5

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ GO_LDFLAGS := -X 'main.Version=${GIT_TAG}'
1111
BIN ?= ${PWD}/bin/${GOOS}/${GOARCH}
1212

1313
LICENSEI := ${BIN}/licensei
14-
LICENSEI_VERSION = v0.8.0
14+
LICENSEI_VERSION = v0.9.0
1515
GOLANGCI_LINT := ${BIN}/golangci-lint
16-
GOLANGCI_LINT_VERSION := v1.61.0
16+
GOLANGCI_LINT_VERSION := v1.63.4
1717

1818
.PHONY: fmt
1919
fmt: ## format Go sources

0 commit comments

Comments
 (0)