From 06bc3d4de5979096a87b6679c93c281d0cedc1cb Mon Sep 17 00:00:00 2001
From: Tmonster <tom@ebergen.com>
Date: Sun, 15 Feb 2026 17:39:02 +0100
Subject: [PATCH 1/2] cherry-pick line changes

---
 .github/workflows/PolarisTesting.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/PolarisTesting.yml b/.github/workflows/PolarisTesting.yml
index e43201f64..b39e51c41 100644
--- a/.github/workflows/PolarisTesting.yml
+++ b/.github/workflows/PolarisTesting.yml
@@ -89,10 +89,10 @@ jobs:
         run: |
           git clone https://github.com/apache/polaris.git polaris_catalog
           cd polaris_catalog
-          git checkout 8fa1c773c8a775834bda24964dbed25c34ef2917
-          ./gradlew clean :polaris-quarkus-server:assemble -Dquarkus.container-image.build=true --no-build-cache
+          git checkout c940ded0f6be44d58ac6f0b6606c41cb08b53304
+          ./gradlew clean :polaris-server:assemble -Dquarkus.container-image.build=true --no-build-cache
           ./gradlew --stop
-          nohup ./gradlew run -Dpolaris.bootstrap.credentials=POLARIS,root,secret > polaris-server.log 2> polaris-error.log &
+          nohup ./gradlew :polaris-server:run > polaris-server.log 2> polaris-error.log &
           cd ..
           # let polaris initialize 
           max_attempts=50
@@ -110,17 +110,22 @@ jobs:
 
       - name: Generate Polaris Data
         run: |
-          python3 -m venv .
-          source ./bin/activate
-          python3 -m pip install poetry
-          python3 -m pip install pyspark==3.5.0
-          python3 -m pip install duckdb
+          cd polaris_catalog 
+          python3 -m venv . 
+          source bin/activate
+          make client-regenerate
+          cd client/python && python3 -m pip install .
+          cd ../../../
           # needed for setup_polaris_catalog.sh
           cd polaris_catalog && ../scripts/polaris/setup_polaris_catalog.sh > user_credentials.json
           cd ..
           python3 scripts/polaris/get_polaris_client_creds.py
           export POLARIS_CLIENT_ID=$(cat polaris_client_id.txt)
           export POLARIS_CLIENT_SECRET=$(cat polaris_client_secret.txt)
+          deactivate
+          python3 -m venv .
+          source bin/activate
+          python3 -m pip install -r scripts/requirements.txt
           python3 -m scripts.data_generators.generate_data polaris
 
       - name: Test with rest catalog

From c373fb556c04564bf3c9566291c6c86b69b18276 Mon Sep 17 00:00:00 2001
From: Tmonster <tom@ebergen.com>
Date: Sun, 15 Feb 2026 18:16:52 +0100
Subject: [PATCH 2/2] use correct secret

---
 scripts/polaris/setup_polaris_catalog.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/polaris/setup_polaris_catalog.sh b/scripts/polaris/setup_polaris_catalog.sh
index 3d6cf0873..d020e96c7 100755
--- a/scripts/polaris/setup_polaris_catalog.sh
+++ b/scripts/polaris/setup_polaris_catalog.sh
@@ -3,7 +3,7 @@
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   catalogs \
   create \
   --storage-type FILE \
@@ -12,21 +12,21 @@
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   principals \
   create \
   quickstart_user
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   principal-roles \
   create \
   quickstart_user_role
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   catalog-roles \
   create \
   --catalog quickstart_catalog \
@@ -34,7 +34,7 @@
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   principal-roles \
   grant \
   --principal quickstart_user \
@@ -42,7 +42,7 @@
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   catalog-roles \
   grant \
   --catalog quickstart_catalog \
@@ -51,7 +51,7 @@
 
 ./polaris \
   --client-id root \
-  --client-secret secret \
+  --client-secret s3cr3t \
   privileges \
   catalog \
   grant \