Skip to content

Commit beb736c

Browse files
authored
Update Go to v1.24.0 (#188)
1 parent 7b29012 commit beb736c

File tree

9 files changed

+42
-28
lines changed

9 files changed

+42
-28
lines changed

.github/dependabot.yml

+18-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,27 @@ updates:
44
- package-ecosystem: gomod
55
directory: /
66
schedule:
7-
interval: daily
7+
interval: weekly
8+
groups:
9+
dev-dependencies:
10+
dependency-type: "development"
11+
prod-dependencies:
12+
dependency-type: "production"
813
- package-ecosystem: github-actions
914
directory: /
1015
schedule:
1116
interval: daily
12-
- package-ecosystem: docker
17+
groups:
18+
dev-dependencies:
19+
dependency-type: "development"
20+
prod-dependencies:
21+
dependency-type: "production"
22+
- package-ecosystem: weekly
1323
directory: /
1424
schedule:
15-
interval: daily
25+
interval: weekly
26+
groups:
27+
dev-dependencies:
28+
dependency-type: "development"
29+
prod-dependencies:
30+
dependency-type: "production"

.github/workflows/pre-main.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818
SHELL: /bin/bash
1919

2020
steps:
21-
- name: Set up Go 1.23
21+
- name: Check out code into the Go module directory
22+
uses: actions/checkout@v4
23+
with:
24+
ref: ${{ github.sha }}
25+
26+
- name: Set up Go
2227
uses: actions/setup-go@v5
2328
with:
24-
go-version: 1.23.6
29+
go-version-file: go.mod
2530

2631
- name: Disable default go problem matcher
2732
run: echo "::remove-matcher owner=go::"
2833

29-
- name: Check out code into the Go module directory
30-
uses: actions/checkout@v4
31-
with:
32-
ref: ${{ github.sha }}
33-
3434
- name: Extract dependent Pull Requests
3535
uses: depends-on/depends-on-action@main
3636
with:
@@ -47,7 +47,7 @@ jobs:
4747
- name: Golangci-lint
4848
uses: golangci/golangci-lint-action@v6
4949
with:
50-
version: v1.63
50+
version: v1.64
5151
args: --timeout 10m0s
5252

5353
- name: Checkmake

.github/workflows/release.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,15 @@ jobs:
6161
username: ${{ secrets.QUAY_ROBOT_USERNAME }}
6262
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
6363

64-
- name: Set up Go 1.23
64+
- name: Check out the repo.
65+
uses: actions/checkout@v4
66+
with:
67+
ref: ${{ github.ref_name }}
68+
69+
- name: Set up Go
6570
uses: actions/setup-go@v5
6671
with:
67-
go-version: 1.23.6
72+
go-version-file: go.mod
6873

6974
- name: Disable default go problem matcher
7075
run: echo "::remove-matcher owner=go::"
@@ -80,11 +85,6 @@ jobs:
8085
sudo mv ${OPERATOR_SDK_BIN} ${OPERATOR_SDK_DEST_FOLDER}/operator-sdk
8186
operator-sdk version
8287
83-
- name: Check out the repo.
84-
uses: actions/checkout@v4
85-
with:
86-
ref: ${{ github.ref_name }}
87-
8888
- name: Build and push sidecar app image
8989
run: docker build --no-cache -t "${SIDECAR_IMG}" -f certsuite-sidecar/Dockerfile . && docker push ${SIDECAR_IMG}
9090

.golangci.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ linters:
4646
- dogsled
4747
- errcheck
4848
- exhaustive
49-
- exportloopref
49+
- copyloopvar
5050
- funlen
5151
- goconst
5252
- gocritic
@@ -85,7 +85,6 @@ linters:
8585
# - nestif
8686
# - noctx
8787
# - prealloc
88-
# - exportloopref
8988
# - structcheck
9089
# - testpackage
9190
# - wsl
@@ -111,6 +110,6 @@ issues:
111110
# golangci.com configuration
112111
# https://github.com/golangci/golangci/wiki/Configuration
113112
service:
114-
golangci-lint-version: 1.63.x # use the fixed version to not introduce new linters unexpectedly
113+
golangci-lint-version: 1.64.x # use the fixed version to not introduce new linters unexpectedly
115114
prepare:
116115
- echo "here I can run custom commands, but no preparation needed for this repo"

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM mirror.gcr.io/library/golang:1.23 AS builder
2+
FROM mirror.gcr.io/library/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ test-e2e:
124124
go test ./test/e2e/ -v -ginkgo.v
125125

126126
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
127-
GOLANGCI_LINT_VERSION ?= v1.63.4
127+
GOLANGCI_LINT_VERSION ?= v1.64.5
128128
golangci-lint:
129129
@[ -f $(GOLANGCI_LINT) ] || { \
130130
set -e ;\
@@ -300,7 +300,7 @@ ifeq (,$(shell which opm 2>/dev/null))
300300
set -e ;\
301301
mkdir -p $(dir $(OPM)) ;\
302302
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
303-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.23.0/$${OS}-$${ARCH}-opm ;\
303+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.24.0/$${OS}-$${ARCH}-opm ;\
304304
chmod +x $(OPM) ;\
305305
}
306306
else

certsuite-sidecar/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN \
1616
# Install Go binary and set the PATH
1717
ENV \
1818
GO_DL_URL=https://golang.org/dl \
19-
GO_BIN_TAR=go1.23.6.linux-amd64.tar.gz \
19+
GO_BIN_TAR=go1.24.0.linux-amd64.tar.gz \
2020
GOPATH=/root/go
2121
ENV GO_BIN_URL_x86_64=${GO_DL_URL}/${GO_BIN_TAR}
2222
RUN \

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/redhat-best-practices-for-k8s/certsuite-operator
22

3-
go 1.23.6
3+
go 1.24.0
44

55
require (
66
github.com/go-logr/logr v1.4.2

scripts/ci/smoke_test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ echo "$crJson" | jq
6060

6161
# Run checks for verdict and counters.
6262
export EXPECTED_VERDICT=${EXPECTED_VERDICT:-"pass"}
63-
export EXPECTED_TOTAL_TCS=${EXPECTED_TOTAL_TCS:-"100"}
63+
export EXPECTED_TOTAL_TCS=${EXPECTED_TOTAL_TCS:-"101"}
6464
export EXPECTED_FAILED=${EXPECTED_FAILED:-"0"}
6565
export EXPECTED_PASSED=${EXPECTED_PASSED:-"5"}
66-
export EXPECTED_SKIPPED=${EXPECTED_SKIPPED:-"95"}
66+
export EXPECTED_SKIPPED=${EXPECTED_SKIPPED:-"96"}
6767

6868
# Check the verdit is pass
6969
echo "$crJson" | jq 'if .status.report.verdict == env.EXPECTED_VERDICT then "verdict is "+env.EXPECTED_VERDICT else error("verdict mismatch: \(.status.report.verdict), expected "+env.EXPECTED_VERDICT) end'

0 commit comments

Comments
 (0)