Skip to content

Commit ffd5567

Browse files
committed
chore: add newer kafka versions and bump Go in CI
- bump Go versions used in CI to baseline of 1.20.x and latest 1.23.x - add newer Kafka version constants to utils.go - bring newer Kafka versions into the FVT rotation and bump default to 3.6.2 in Dockerfile and docker-compose - use newer ZooKeeper version in docker-compose too - bump golangci-lint version to latest (and fix for vet changes) Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>
1 parent c6b288a commit ffd5567

File tree

15 files changed

+192
-45
lines changed

15 files changed

+192
-45
lines changed

.github/workflows/apidiff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Go
2424
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2525
with:
26-
go-version: 1.22.x
26+
go-version: 1.23.x
2727
- name: Add GOBIN to PATH
2828
run: echo "$(go env GOPATH)/bin" >>$GITHUB_PATH
2929
- name: Install apidiff cmd

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
go-version: [1.22.x]
28+
go-version: [1.23.x]
2929
steps:
3030
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3131
with:
@@ -39,14 +39,14 @@ jobs:
3939
GOFLAGS: -tags=functional
4040
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
4141
with:
42-
version: v1.57.2
42+
version: v1.60.2
4343
test:
4444
name: Unit Testing with Go ${{ matrix.go-version }}
4545
runs-on: ubuntu-latest
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
go-version: [1.19.x, 1.21.x, 1.22.x]
49+
go-version: [1.20.x, 1.23.x]
5050
env:
5151
DEBUG: true
5252
GOFLAGS: -trimpath

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup Go
3838
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3939
with:
40-
go-version: 1.22.x
40+
go-version: 1.23.x
4141
- name: Autobuild
4242
uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
4343
- name: Perform CodeQL Analysis

.github/workflows/fuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828
- name: Setup Go
2929
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3030
with:
31-
go-version: 1.22.x
31+
go-version: 1.23.x
3232
- name: Run any fuzzing tests
3333
run: go test -list . | grep '^Fuzz' | parallel 'go test -v -run=^{}$ -fuzz=^{}$ -fuzztime=5m'

.github/workflows/fvt-main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
go-version: [1.22.x]
20-
kafka-version: [1.0.2, 2.0.1, 2.2.2, 2.6.2, 2.8.2, 3.0.2, 3.3.2, 3.6.0]
19+
go-version: [1.23.x]
20+
kafka-version: [1.0.2, 2.0.1, 2.2.2, 2.6.2, 2.8.2, 3.0.2, 3.3.2, 3.6.2, 3.8.2]
2121
include:
2222
- kafka-version: 1.0.2
2323
scala-version: 2.11
@@ -33,7 +33,9 @@ jobs:
3333
scala-version: 2.12
3434
- kafka-version: 3.3.2
3535
scala-version: 2.13
36-
- kafka-version: 3.6.0
36+
- kafka-version: 3.6.2
37+
scala-version: 2.13
38+
- kafka-version: 3.8.2
3739
scala-version: 2.13
3840
uses: ./.github/workflows/fvt.yml
3941
with:

.github/workflows/fvt-pr.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
go-version: [1.22.x]
19-
kafka-version: [1.0.2, 2.6.2, 3.6.0]
18+
go-version: [1.23.x]
19+
kafka-version: [1.0.2, 2.6.2, 3.6.2]
2020
include:
2121
- kafka-version: 1.0.2
2222
scala-version: 2.11
2323
- kafka-version: 2.6.2
2424
scala-version: 2.12
25-
- kafka-version: 3.6.0
25+
- kafka-version: 3.6.2
26+
scala-version: 2.13
27+
- kafka-version: 3.8.2
2628
scala-version: 2.13
2729
uses: ./.github/workflows/fvt.yml
2830
with:

.github/workflows/fvt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55
go-version:
66
required: false
77
type: string
8-
default: 1.22.x
8+
default: 1.23.x
99
kafka-version:
1010
required: false
1111
type: string
12-
default: 3.6.0
12+
default: 3.6.2
1313
scala-version:
1414
required: false
1515
type: string

.github/workflows/i386.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Go
2929
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3030
with:
31-
go-version: 1.22.x
31+
go-version: 1.23.x
3232
- name: staticcheck
3333
env:
3434
GOARCH: 386

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
run:
2+
go: "1.20"
23
timeout: 5m
34
deadline: 10m
45

@@ -57,7 +58,7 @@ linters:
5758
enable:
5859
- bodyclose
5960
- depguard
60-
- exportloopref
61+
# - copyloopvar
6162
- dogsled
6263
- errcheck
6364
- errorlint
@@ -79,6 +80,7 @@ linters:
7980

8081
issues:
8182
exclude:
83+
- "G115: integer overflow conversion"
8284
- "G404: Use of weak random number generator"
8385
exclude-rules:
8486
# exclude some linters from running on certains files.

Dockerfile.kafka

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN cd /etc/java/java-11-openjdk/*/conf/security \
1919
ARG SCALA_VERSION="2.13"
2020
ARG KAFKA_VERSION="3.6.0"
2121

22-
# https://github.com/apache/kafka/blob/9989b68d0d38c8f1357f78bf9d53a58c1476188d/tests/docker/Dockerfile#L46-L72
22+
# https://github.com/apache/kafka/blob/0eaaff88cf68bc2c24d4874ff9bc1cc2b493c24b/tests/docker/Dockerfile#L75-L103
2323
ARG KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages"
2424
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2525
RUN mkdir -p "/opt/kafka-${KAFKA_VERSION}" \

0 commit comments

Comments
 (0)