Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] bump golang build versions #26

Merged
merged 4 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions .golangci.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
"gofmt"
]
},
"run": {
"skip-files": [
"issues": {
"exclude-files": [
"/zz_generated_"
],
"deadline": "5m"
]
},
"run": {
"timeout": "5m"
}
}
2 changes: 1 addition & 1 deletion Dockerfile.client
Original file line number Diff line number Diff line change
@@ -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/[email protected]
RUN apk add --no-cache make
RUN apk add --no-cache bash
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.proxy
Original file line number Diff line number Diff line change
@@ -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/[email protected]
RUN apk add --no-cache make
RUN apk add --no-cache bash
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/default
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ cd $(dirname $0)

./build
./test
./package
#./package

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this step is getting skipped?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This repo doesn't actually have a /scripts/package file currently.