Skip to content

Commit

Permalink
Update Go version to 1.20 (#4206)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Resolves #4202 

## Short description of the changes
All the files mentioned in issue #4202 have been updated with Go version
1.20 replacing version 1.19

Signed-off-by: Saarthak Maini <saarthakmainiofficial@gmail.com>

---------

Signed-off-by: Saarthak <saarthakmaini@gmail.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
  • Loading branch information
SaarthakMaini and yurishkuro authored Mar 4, 2023
1 parent 82d7f9b commit 1d3bc1d
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-all-in-one-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run cassandra integration tests
run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.image }} ${{ matrix.version.schema }}
2 changes: 1 addition & 1 deletion .github/workflows/ci-crossdock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install tools
run: make install-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-grpc-badger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run Badger storage integration tests
run: make badger-storage-integration-test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-hotrod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run kafka integration tests
run: bash scripts/kafka-integration-test.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-opensearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install tools
run: make install-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-protogen-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run protogen validation
run: make proto && git diff --name-status --exit-code
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install tools
run: make install-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Add GOPATH
run: |
Expand Down
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
go: '1.19'
go: '1.20'
timeout: 10m
skip-dirs:
- mocks
Expand Down Expand Up @@ -27,7 +27,7 @@ linters-settings:
- G404
- G601
gosimple:
go: "1.19"
go: "1.20"

linters:
enable:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ draft-release:
.PHONY: install-tools
install-tools:
go install github.com/vektra/mockery/v2@v2.14.0
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.0
go install mvdan.cc/gofumpt@latest

.PHONY: install-ci
Expand Down
4 changes: 1 addition & 3 deletions cmd/anonymizer/app/query/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ func (q *Query) QueryTrace(traceID string) ([]model.Span, error) {
if err != nil {
return nil, unwrapNotFoundErr(err)
}
for i := range received.Spans {
spans = append(spans, received.Spans[i])
}
spans = append(spans, received.Spans...)
}

return spans, nil
Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION := 1.0.0
ROOT_IMAGE ?= alpine:3.16
CERT_IMAGE := $(ROOT_IMAGE)
GOLANG_IMAGE := golang:1.19-alpine
GOLANG_IMAGE := golang:1.20-alpine

DOCKER_REGISTRY ?= localhost:5000
BASE_IMAGE ?= $(DOCKER_REGISTRY)/baseimg_alpine:latest
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

go 1.19
go 1.20

require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2
Expand Down

0 comments on commit 1d3bc1d

Please sign in to comment.