Skip to content

Commit e73a4a3

Browse files
authored
Merge pull request #26 from mallardduck/golang-bumps
[main] bump golang build versions
2 parents 72987d8 + 54f910b commit e73a4a3

File tree

9 files changed

+16
-13
lines changed

9 files changed

+16
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
- name : Set up Go
2828
uses : actions/setup-go@v5
2929
with:
30-
go-version: 1.22
30+
go-version: 1.23
3131
- name : CI
3232
run : make ci

.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.22'
24+
go-version: '1.23'
2525
- name: golangci-lint
2626
uses: golangci/golangci-lint-action@v6
2727
with:
2828
# Require: The version of golangci-lint to use.
2929
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
3030
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
31-
version: v1.56
31+
version: v1.61
3232
skip-cache: true

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name : Setup go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: 1.22
30+
go-version: 1.23
3131
- name: Set up Docker Buildx
3232
uses: docker/setup-buildx-action@v3
3333
- name: Log in to the Container registry

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- run: git fetch --force --tags
1919
- uses: actions/setup-go@v5
2020
with:
21-
go-version: 1.22
21+
go-version: 1.23
2222
- uses: goreleaser/goreleaser-action@v6
2323
with:
2424
distribution: goreleaser

.golangci.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
"gofmt"
1111
]
1212
},
13-
"run": {
14-
"skip-files": [
13+
"issues": {
14+
"exclude-files": [
1515
"/zz_generated_"
16-
],
17-
"deadline": "5m"
16+
]
17+
},
18+
"run": {
19+
"timeout": "5m"
1820
}
1921
}

Dockerfile.client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.18 as builder
1+
FROM golang:1.23-alpine3.20 AS builder
22
RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2
33
RUN apk add --no-cache make
44
RUN apk add --no-cache bash

Dockerfile.proxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.18 as builder
1+
FROM golang:1.23-alpine3.20 AS builder
22
RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2
33
RUN apk add --no-cache make
44
RUN apk add --no-cache bash

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/rancher/pushprox
22

3-
go 1.22
3+
go 1.23
4+
toolchain go1.23.1
45

56
require (
67
github.com/Showmax/go-fqdn v1.0.0

scripts/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ cd $(dirname $0)
55

66
./build
77
./test
8-
./package
8+
#./package

0 commit comments

Comments
 (0)