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.

Sign up for GitHub

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

Jump to bottom

Update dependency go to v1.23.0 #5837

Merged
merged 6 commits into from
Aug 14, 2024
Merged

Update dependency go to v1.23.0 #5837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47fc24c
Update dependency go to v1.23.0
renovate-bot Aug 13, 2024
3d2ba51
bump version across the board via ./scripts/check-go-version.sh -u
yurishkuro Aug 13, 2024
2afd05c
fix
yurishkuro Aug 13, 2024
af84a14
fix
yurishkuro Aug 13, 2024
7b8d910
fix
yurishkuro Aug 13, 2024
34993ad
Merge branch 'main' into renovate/go-1.x
yurishkuro Aug 14, 2024
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/actions/setup-go-tip/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runs:
if: steps.download.outputs.success == 'false'
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Build Go Tip from source
if: steps.download.outputs.success == 'false'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

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

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docker-all-in-one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

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

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

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

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-badger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Run Badger storage integration tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-cassandra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Run cassandra integration tests
id: test-execution
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
- name: Run ${{ matrix.version.distribution }} integration tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-grpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Run gRPC storage integration tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-kafka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Run Kafka integration tests
id: test-execution
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-memory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Run Memory storage integration tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-opensearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-spm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-lint-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Print Jaeger version
run: make echo-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-lint-protogen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Verify Protobuf types are up to date
run: make proto && git diff --name-status --exit-code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

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

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x
cache-dependency-path: ./go.sum

# download dependencies separately to keep unit test step's output cleaner
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Add GOPATH
run: |
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,5 @@ linters-settings:
- suite-extra-assert-call

run:
go: "1.21"
go: "1.22"
timeout: 20m
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,10 @@ init-submodules:

MOCKERY_FLAGS := --all --disable-version-string
.PHONY: generate-mocks
# TODO remove GODEBUG=gotypesalias=0
# once this is fixed: https://github.com/vektra/mockery/issues/803
Copy link
Member

Choose a reason for hiding this comment

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

pending upstream fix vektra/mockery#803

generate-mocks: $(MOCKERY)
$(MOCKERY)
GODEBUG=gotypesalias=0 $(MOCKERY)

.PHONY: certs
certs:
Expand Down
4 changes: 2 additions & 2 deletions docker/debug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

FROM golang:1.22.6-alpine AS build
FROM golang:1.23.0-alpine AS build
ARG TARGETARCH
ENV GOPATH /go
RUN apk add --update --no-cache ca-certificates make git build-base mailcap
Expand All @@ -13,7 +13,7 @@ RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" ]] ; then \
go install github.com/go-delve/delve/cmd/dlv@latest; \
fi

FROM golang:1.22.6-alpine
FROM golang:1.23.0-alpine
COPY --from=build /go/bin/dlv /go/bin/dlv
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=build /etc/mime.types /etc/mime.types
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/jaegertracing/jaeger

go 1.21.0
go 1.22.0

toolchain go1.22.6
toolchain go1.23.0

require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jaegertracing/jaeger/internal/tools

go 1.22.3
go 1.23.0

require (
github.com/golangci/golangci-lint v1.60.0
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-go-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function check() {
if [ "$go_version" = "$target" ]; then
mismatch=''
else
mismatch='*** needs update ***'
mismatch="*** needs update to $target ***"
files_to_update=$((files_to_update+1))
fi

Expand Down
Loading