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

chore: add version consts for 3.8.1+3.9.0 #3011

Merged
merged 1 commit into from
Nov 8, 2024
Merged

chore: add version consts for 3.8.1+3.9.0 #3011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/workflows/fvt-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
go-version: [1.23.x]
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.0]
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.1]
include:
- kafka-version: 1.0.2
scala-version: 2.11
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fvt-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
fail-fast: false
matrix:
go-version: [1.23.x]
kafka-version: [1.0.2, 2.6.2, 3.6.2, 3.8.0]
kafka-version: [1.0.2, 2.6.2, 3.6.2, 3.8.1]
include:
- kafka-version: 1.0.2
scala-version: 2.11
- kafka-version: 2.6.2
scala-version: 2.12
- kafka-version: 3.6.2
scala-version: 2.13
- kafka-version: 3.8.0
- kafka-version: 3.8.1
scala-version: 2.13
uses: ./.github/workflows/fvt.yml
with:
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fail_fast: false
default_install_hook_types: [pre-commit, commit-msg]
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: check-merge-conflict
- id: check-yaml
Expand Down Expand Up @@ -32,10 +32,10 @@ repos:
files: \.go$
args: []
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.3
rev: v8.21.2
hooks:
- id: gitleaks
- repo: https://github.com/golangci/golangci-lint
rev: v1.52.2
rev: v1.61.0
hooks:
- id: golangci-lint
4 changes: 2 additions & 2 deletions Dockerfile.kafka
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ RUN cd /etc/java/java-11-openjdk/*/conf/security \
&& echo 'networkaddress.cache.negative.ttl=0' >> java.security

ARG SCALA_VERSION="2.13"
ARG KAFKA_VERSION="3.6.0"
ARG KAFKA_VERSION="3.6.2"

# https://github.com/apache/kafka/blob/0eaaff88cf68bc2c24d4874ff9bc1cc2b493c24b/tests/docker/Dockerfile#L75-L103
# https://github.com/apache/kafka/blob/2e2b0a58eda3e677763af974a44a6aaa3c280214/tests/docker/Dockerfile#L77-L105
ARG KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir -p "/opt/kafka-${KAFKA_VERSION}" \
Expand Down
6 changes: 5 additions & 1 deletion utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ var (
V3_7_0_0 = newKafkaVersion(3, 7, 0, 0)
V3_7_1_0 = newKafkaVersion(3, 7, 1, 0)
V3_8_0_0 = newKafkaVersion(3, 8, 0, 0)
V3_8_1_0 = newKafkaVersion(3, 8, 1, 0)
V3_9_0_0 = newKafkaVersion(3, 9, 0, 0)

SupportedVersions = []KafkaVersion{
V0_8_2_0,
Expand Down Expand Up @@ -274,9 +276,11 @@ var (
V3_7_0_0,
V3_7_1_0,
V3_8_0_0,
V3_8_1_0,
V3_9_0_0,
}
MinVersion = V0_8_2_0
MaxVersion = V3_8_0_0
MaxVersion = V3_9_0_0
DefaultVersion = V2_1_0_0

// reduced set of protocol versions to matrix test
Expand Down
Loading