Skip to content

Commit

Permalink
Bump the minimum Go version to 1.22 (#1300)
Browse files Browse the repository at this point in the history
  • Loading branch information
BewareMyPower authored Oct 26, 2024
1 parent a7ef9ed commit 310fb94
Show file tree
Hide file tree
Showing 60 changed files with 488 additions and 497 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ '1.21', '1.22' ]
go-version: [ '1.22', '1.23' ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v5
Expand All @@ -36,19 +36,19 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'
- name: Check license header
run: docker run --rm -v $(pwd):/github/workspace ghcr.io/korandoru/hawkeye-native:v3 check
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.51.2
version: v1.61.0

integration-tests:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ '1.21', '1.22' ]
go-version: [ '1.22', '1.23' ]
steps:
- uses: actions/checkout@v3
- name: clean docker cache
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set via the Makefile or CLI
ARG PULSAR_IMAGE=apachepulsar/pulsar:latest

ARG GO_VERSION=1.20
ARG GO_VERSION=1.22
FROM golang:$GO_VERSION as golang

FROM $PULSAR_IMAGE
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
IMAGE_NAME = pulsar-client-go-test:latest
PULSAR_VERSION ?= 3.2.2
PULSAR_IMAGE = apachepulsar/pulsar:$(PULSAR_VERSION)
GO_VERSION ?= 1.21
GO_VERSION ?= 1.22
CONTAINER_ARCH ?= $(shell uname -m | sed s/x86_64/amd64/)

# Golang standard bin directory.
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/apache/pulsar-client-go

go 1.21
go 1.22

require (
github.com/99designs/keyring v1.2.1
Expand Down
10 changes: 5 additions & 5 deletions oauth2/auth_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"context"
"testing"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)

func TestAuth(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "cloud-cli Auth Suite")
gomega.RegisterFailHandler(ginkgo.Fail)
ginkgo.RunSpecs(t, "cloud-cli Auth Suite")
}

type MockTokenExchanger struct {
Expand All @@ -52,7 +52,7 @@ func (te *MockTokenExchanger) ExchangeClientCredentials(req ClientCredentialsExc
return te.ReturnsTokens, te.ReturnsError
}

func (te *MockTokenExchanger) ExchangeDeviceCode(ctx context.Context,
func (te *MockTokenExchanger) ExchangeDeviceCode(_ context.Context,
req DeviceCodeExchangeRequest) (*TokenResult, error) {
te.CalledWithRequest = &req
return te.ReturnsTokens, te.ReturnsError
Expand Down
Loading

0 comments on commit 310fb94

Please sign in to comment.