Skip to content

Commit

Permalink
release-1.24: Bump go to 1.20.10 (#5844)
Browse files Browse the repository at this point in the history
Also bump golangci-lint to match release-1.25 and fixes lint errors

Signed-off-by: Sunjay Bhatia <[email protected]>
  • Loading branch information
sunjayBhatia authored Oct 12, 2023
1 parent f8b1e2c commit 4d50ef8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
env:
GOPROXY: https://proxy.golang.org/
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
GO_VERSION: 1.19.13
GO_VERSION: 1.20.10
jobs:
e2e-envoy-xds:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
env:
GOPROXY: https://proxy.golang.org/
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
GO_VERSION: 1.19.13
GO_VERSION: 1.20.10
jobs:
lint:
runs-on: ubuntu-latest
Expand All @@ -23,7 +23,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.50.1
version: v1.51.1
args: --build-tags=e2e,conformance,gcp,oidc,none
- uses: act10ns/slack@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ endif
IMAGE_PLATFORMS ?= linux/amd64,linux/arm64

# Base build image to use.
BUILD_BASE_IMAGE ?= golang:1.19.13
BUILD_BASE_IMAGE ?= golang:1.20.10

# Enable build with CGO.
BUILD_CGO_ENABLED ?= 0
Expand Down Expand Up @@ -195,7 +195,7 @@ lint-codespell:
.PHONY: lint-golint
lint-golint:
@echo Running Go linter ...
@./hack/golangci-lint run --build-tags=e2e,conformance,gcp,oidc,tools,none
@./hack/golangci-lint run --build-tags=e2e,conformance,gcp,oidc,none

# The inline config is needed to allow the Gateway API validating webhook YAML
# (which we import directly from the Gateway API repo) to pass.
Expand Down
2 changes: 1 addition & 1 deletion hack/golangci-lint
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if command -v docker >/dev/null; then
--rm \
--volume $(pwd):/app \
--workdir /app \
golangci/golangci-lint:v1.50.1 ${PROGNAME} "$@"
golangci/golangci-lint:v1.51.1 ${PROGNAME} "$@"
fi

cat <<EOF
Expand Down
2 changes: 0 additions & 2 deletions internal/featuretests/v3/featuretests.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ func setup(t *testing.T, opts ...interface{}) (cache.ResourceEventHandler, *Cont

registry := prometheus.NewRegistry()

rand.Seed(time.Now().Unix())

builder := &dag.Builder{
Source: dag.KubernetesCache{
FieldLogger: log,
Expand Down

0 comments on commit 4d50ef8

Please sign in to comment.