From dc794292ad749c52d5485ceea0750fb98d77e615 Mon Sep 17 00:00:00 2001 From: yeikel Date: Wed, 11 Dec 2024 20:04:30 -0500 Subject: [PATCH 1/5] refactor: remove unnecessary logic --- api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java b/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java index 554387a1a..c404ac5d3 100644 --- a/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java +++ b/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java @@ -35,10 +35,7 @@ public abstract class AbstractIntegrationTest { public static final String LOCAL = "local"; public static final String SECOND_LOCAL = "secondLocal"; - private static final boolean IS_ARM = - System.getProperty("os.arch").contains("arm") || System.getProperty("os.arch").contains("aarch64"); - - private static final String CONFLUENT_PLATFORM_VERSION = IS_ARM ? "7.2.1.arm64" : "7.2.1"; + private static final String CONFLUENT_PLATFORM_VERSION = "7.2.1"; public static final KafkaContainer kafka = new KafkaContainer( DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION)) From f13b7ea3ff1ecea411ddc940c57b229f66761dc9 Mon Sep 17 00:00:00 2001 From: Yeikel Date: Sun, 15 Dec 2024 20:59:30 -0500 Subject: [PATCH 2/5] Update backend_tests.yml --- .github/workflows/backend_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index e9e6f975c..43be759bb 100644 --- a/.github/workflows/backend_tests.yml +++ b/.github/workflows/backend_tests.yml @@ -15,7 +15,7 @@ permissions: jobs: build-and-test: - runs-on: ubuntu-latest + runs-on: macos-latest-xlarge steps: - name: Checkout From 77f618b06957c89d9c2ba8d141d11be0b913424f Mon Sep 17 00:00:00 2001 From: Yeikel Date: Mon, 16 Dec 2024 02:07:27 -0500 Subject: [PATCH 3/5] Update backend_tests.yml --- .github/workflows/backend_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index 43be759bb..1ef02fa7c 100644 --- a/.github/workflows/backend_tests.yml +++ b/.github/workflows/backend_tests.yml @@ -15,7 +15,7 @@ permissions: jobs: build-and-test: - runs-on: macos-latest-xlarge + runs-on: macos-latest steps: - name: Checkout From e4092565057b5ddaade51d17a93e8fe8d27bbc80 Mon Sep 17 00:00:00 2001 From: yeikel Date: Mon, 23 Dec 2024 14:42:09 -0500 Subject: [PATCH 4/5] Revert --- .github/workflows/backend_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index 1ef02fa7c..e9e6f975c 100644 --- a/.github/workflows/backend_tests.yml +++ b/.github/workflows/backend_tests.yml @@ -15,7 +15,7 @@ permissions: jobs: build-and-test: - runs-on: macos-latest + runs-on: ubuntu-latest steps: - name: Checkout From c0bf9ab9163dec521f5c5e976e41b02d03ed76b3 Mon Sep 17 00:00:00 2001 From: yeikel Date: Mon, 23 Dec 2024 14:53:12 -0500 Subject: [PATCH 5/5] bump test contaienrs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43427b3f1..39d83bffb 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 5.11.2 5.14.2 4.12.0 - 1.20.2 + 1.20.4 v18.17.1