diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1796648c..d897854e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,6 +27,6 @@ jobs: - name : Set up Go uses : actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name : CI run : make ci \ No newline at end of file diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c9530dd5..7715fb9e 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -21,12 +21,12 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: # Require: The version of golangci-lint to use. # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version. # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit. - version: v1.56 + version: v1.61 skip-cache: true \ No newline at end of file diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ace875ff..9fb31cf4 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -27,7 +27,7 @@ jobs: - name : Setup go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d01ed3e3..795c4fc4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,7 @@ jobs: - run: git fetch --force --tags - uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.23 - uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser diff --git a/.golangci.json b/.golangci.json index 3c2fb695..836c74d7 100644 --- a/.golangci.json +++ b/.golangci.json @@ -10,10 +10,12 @@ "gofmt" ] }, - "run": { - "skip-files": [ + "issues": { + "exclude-files": [ "/zz_generated_" - ], - "deadline": "5m" + ] + }, + "run": { + "timeout": "5m" } } \ No newline at end of file diff --git a/Dockerfile.client b/Dockerfile.client index 6ee18645..ac93adff 100644 --- a/Dockerfile.client +++ b/Dockerfile.client @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine3.18 as builder +FROM golang:1.23-alpine3.20 AS builder RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 RUN apk add --no-cache make RUN apk add --no-cache bash diff --git a/Dockerfile.proxy b/Dockerfile.proxy index 28722055..af426ac5 100644 --- a/Dockerfile.proxy +++ b/Dockerfile.proxy @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine3.18 as builder +FROM golang:1.23-alpine3.20 AS builder RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 RUN apk add --no-cache make RUN apk add --no-cache bash diff --git a/go.mod b/go.mod index 69f98a8b..dbcd6f77 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/rancher/pushprox -go 1.22 +go 1.23 +toolchain go1.23.1 require ( github.com/Showmax/go-fqdn v1.0.0 diff --git a/scripts/default b/scripts/default index af2ad2db..adbd2e7c 100755 --- a/scripts/default +++ b/scripts/default @@ -5,4 +5,4 @@ cd $(dirname $0) ./build ./test -./package +#./package