Skip to content

Commit e9530e8

Browse files
authored
Merge pull request #332 from projectsyn/update-actions-go
Update GitHub actions and Go version
2 parents e08cf47 + 7f84ddb commit e9530e8

7 files changed

Lines changed: 93 additions & 99 deletions

File tree

.github/workflows/e2e.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ jobs:
1414
- kind-node-version: v1.20.15
1515
- kind-node-version: v1.24.2
1616
steps:
17-
- uses: actions/checkout@v4
18-
- name: Determine Go version from go.mod
19-
run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2 | cut -d "." -f 1,2)" >> $GITHUB_ENV
20-
- uses: actions/setup-go@v5
17+
- uses: actions/checkout@v6
18+
- uses: actions/setup-go@v6
2119
with:
22-
go-version: ${{ env.GO_VERSION }}
20+
go-version-file: 'go.mod'
2321
- name: Run e2e tests
2422
run: make crd e2e-test -e KIND_NODE_VERSION=${{ matrix.kind-node-version }} -e KIND_KUBECTL_ARGS=--validate=false -e bats_args="--report-formatter junit"
2523
- name: Publish Test Report

.github/workflows/lint.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ jobs:
1010
lint:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- name: Determine Go version from go.mod
15-
run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2 | cut -d "." -f 1,2)" >> $GITHUB_ENV
16-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-go@v6
1715
with:
18-
go-version: ${{ env.GO_VERSION }}
16+
go-version-file: 'go.mod'
1917
- name: Run linters
2018
run: make generate lint

.github/workflows/master.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ jobs:
99
dist:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- name: Determine Go version from go.mod
14-
run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2 | cut -d "." -f 1,2)" >> $GITHUB_ENV
15-
- uses: actions/setup-go@v5
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-go@v6
1614
with:
17-
go-version: ${{ env.GO_VERSION }}
15+
go-version-file: 'go.mod'
1816
- name: Build docker images
1917
run: make docker-build -e IMG_TAG=${GITHUB_REF#refs/heads/}
2018
- name: Login to Docker hub

.github/workflows/release.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@ jobs:
99
dist:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-go@v6
1314
with:
14-
fetch-depth: 0
15-
- name: Determine Go version from go.mod
16-
run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2 | cut -d "." -f 1,2)" >> $GITHUB_ENV
17-
- uses: actions/setup-go@v5
18-
with:
19-
go-version: ${{ env.GO_VERSION }}
15+
go-version-file: 'go.mod'
2016
- name: Login to Docker hub
2117
run: docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_PASSWORD }}"
2218
- name: Login to quay.io

.github/workflows/test.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,9 @@ jobs:
1212
test:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
- name: Determine Go version from go.mod
17-
run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2 | cut -d "." -f 1,2)" >> $GITHUB_ENV
18-
- uses: actions/setup-go@v5
15+
- uses: actions/checkout@v6
16+
- uses: actions/setup-go@v6
1917
with:
20-
go-version: ${{ env.GO_VERSION }}
18+
go-version-file: 'go.mod'
2119
- name: Run tests
2220
run: make integration-test
23-
# - name: Upload code coverage report to Code Climate
24-
# uses: paambaati/codeclimate-action@v2.7.5
25-
# env:
26-
# CC_TEST_REPORTER_ID: b25e8875aef082d5eee059d71d76dac6d3e0ed23847f6004c1598afe35dadff5
27-
# with:
28-
# coverageLocations: cover.out:gocov
29-
# prefix: github.com/${{ github.repository }}

go.mod

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/projectsyn/lieutenant-operator
22

3-
go 1.24.0
4-
5-
toolchain go1.24.6
3+
go 1.26.1
64

75
require (
86
dario.cat/mergo v1.0.0
@@ -13,7 +11,7 @@ require (
1311
github.com/kouhin/envflag v0.0.0-20150818174321-0e9a86061649
1412
github.com/prometheus/client_golang v1.23.0
1513
github.com/ryankurte/go-structparse v1.2.0
16-
github.com/stretchr/testify v1.10.0
14+
github.com/stretchr/testify v1.11.1
1715
github.com/xanzy/go-gitlab v0.107.0
1816
go.uber.org/atomic v1.11.0
1917
go.uber.org/multierr v1.11.0
@@ -30,7 +28,7 @@ require (
3028
al.essio.dev/pkg/shellescape v1.5.1 // indirect
3129
cloud.google.com/go/auth v0.13.0 // indirect
3230
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
33-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
31+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
3432
cloud.google.com/go/iam v1.2.2 // indirect
3533
emperror.dev/errors v0.8.1 // indirect
3634
github.com/BurntSushi/toml v1.4.0 // indirect
@@ -52,7 +50,7 @@ require (
5250
github.com/fsnotify/fsnotify v1.9.0 // indirect
5351
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
5452
github.com/go-errors/errors v1.5.1 // indirect
55-
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
53+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
5654
github.com/go-logr/stdr v1.2.2 // indirect
5755
github.com/go-openapi/jsonpointer v0.21.2 // indirect
5856
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -111,32 +109,32 @@ require (
111109
github.com/spf13/pflag v1.0.7 // indirect
112110
github.com/x448/float16 v0.8.4 // indirect
113111
github.com/xlab/treeprint v1.2.0 // indirect
114-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
112+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
115113
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
116114
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
117-
go.opentelemetry.io/otel v1.33.0 // indirect
118-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
119-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
115+
go.opentelemetry.io/otel v1.39.0 // indirect
116+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
120118
go.yaml.in/yaml/v2 v2.4.2 // indirect
121119
go.yaml.in/yaml/v3 v3.0.4 // indirect
122-
golang.org/x/crypto v0.41.0 // indirect
123-
golang.org/x/mod v0.27.0 // indirect
124-
golang.org/x/net v0.43.0 // indirect
125-
golang.org/x/oauth2 v0.30.0 // indirect
126-
golang.org/x/sync v0.16.0 // indirect
127-
golang.org/x/sys v0.35.0 // indirect
128-
golang.org/x/term v0.34.0 // indirect
129-
golang.org/x/text v0.28.0 // indirect
120+
golang.org/x/crypto v0.49.0 // indirect
121+
golang.org/x/mod v0.33.0 // indirect
122+
golang.org/x/net v0.52.0 // indirect
123+
golang.org/x/oauth2 v0.34.0 // indirect
124+
golang.org/x/sync v0.20.0 // indirect
125+
golang.org/x/sys v0.42.0 // indirect
126+
golang.org/x/term v0.41.0 // indirect
127+
golang.org/x/text v0.35.0 // indirect
130128
golang.org/x/time v0.12.0 // indirect
131-
golang.org/x/tools v0.36.0 // indirect
129+
golang.org/x/tools v0.42.0 // indirect
132130
golang.org/x/tools/go/expect v0.1.0-deprecated // indirect
133131
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
134132
google.golang.org/api v0.215.0 // indirect
135133
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
136-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
138-
google.golang.org/grpc v1.68.1 // indirect
139-
google.golang.org/protobuf v1.36.7 // indirect
134+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
135+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 // indirect
136+
google.golang.org/grpc v1.79.3 // indirect
137+
google.golang.org/protobuf v1.36.11 // indirect
140138
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
141139
gopkg.in/inf.v0 v0.9.1 // indirect
142140
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)