Skip to content

Commit

Permalink
Use Golang 1.20 (#2205)
Browse files Browse the repository at this point in the history
* Upgrade to Golang 1.20. #2190

Signed-off-by: Israel Blancas <[email protected]>

* Upgrade golangci-lint

Signed-off-by: Israel Blancas <[email protected]>

* Disable deepguard. It was not used before

Signed-off-by: Israel Blancas <[email protected]>

---------

Signed-off-by: Israel Blancas <[email protected]>
  • Loading branch information
iblancasa authored Jun 15, 2023
1 parent 723105f commit ac991eb
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/base-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: "1.20"

- name: Check out code into the Go module directory
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: "1.20"

- uses: actions/checkout@v3

Expand Down
5 changes: 2 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
run:
go: '1.19'
go: '1.20'
timeout: 10m

linters-settings:
goimports:
local-prefixes: github.com/jaegertracing/jaeger-operator
gosimple:
go: "1.19"
go: "1.20"

linters:
enable:
- depguard
- gofmt
- gofumpt
- goimports
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19 as builder
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.asserts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19 as builder
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder

WORKDIR /workspace

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jaegertracing/jaeger-operator

go 1.19
go 1.20

require (
github.com/Masterminds/semver v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion hack/install/install-golangci-lint.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
VERSION="1.50.1"
VERSION="1.53.2"

echo "Installing golangci-lint"

Expand Down

0 comments on commit ac991eb

Please sign in to comment.