From 3bbffbbab284a2dac06db43e4e67f26078d19ee0 Mon Sep 17 00:00:00 2001
From: Miro Stauder <miro@proxysql.com>
Date: Fri, 3 Jan 2025 11:00:35 +0100
Subject: [PATCH] fix testtree switch

---
 .github/workflows/ci-3p-django-framework.yml    |  4 ++--
 .github/workflows/ci-3p-laravel-framework.yml   |  3 +--
 .github/workflows/ci-3p-mariadb-connector-c.yml |  3 ++-
 .github/workflows/ci-3p-mysql-connector-j.yml   |  4 ++--
 .github/workflows/ci-3p-php-pdo-mysql.yml       |  6 +++---
 .github/workflows/ci-3p-postgresql.yml          | 16 ++++++++--------
 .github/workflows/ci-3p-sqlalchemy.yml          |  5 +++--
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci-3p-django-framework.yml b/.github/workflows/ci-3p-django-framework.yml
index e9513ab12..282de9734 100644
--- a/.github/workflows/ci-3p-django-framework.yml
+++ b/.github/workflows/ci-3p-django-framework.yml
@@ -91,8 +91,8 @@ jobs:
         set +e
         
         cd proxysql_3p_testing/
-        #git sparse-checkout list
         ./setup.sh test_django-framework
+        git switch ${{ env.TESTTREE }}
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql .
@@ -116,7 +116,7 @@ jobs:
         
         cd proxysql_3p_testing/test_django-framework
         #sed -i 's/docker-compose/docker compose/g' run-tests.bash
-        INFRADB=${{ matrix.infradb }} CONNECTOR=${{ matrix.connector }} ./run-tests.bash
+        ./run-tests.bash
         RC=$?
         
         #sudo chmod -R 777 ${{ github.workspace }}/*
diff --git a/.github/workflows/ci-3p-laravel-framework.yml b/.github/workflows/ci-3p-laravel-framework.yml
index c7ad084e1..a3b350288 100644
--- a/.github/workflows/ci-3p-laravel-framework.yml
+++ b/.github/workflows/ci-3p-laravel-framework.yml
@@ -91,7 +91,6 @@ jobs:
         set +e
         
         cd proxysql_3p_testing/
-        git sparse-checkout list
         ./setup.sh test_laravel-framework/laravel-framework
         git switch ${{ env.TESTTREE }}
         
@@ -119,7 +118,7 @@ jobs:
         set +e
         
         cd proxysql_3p_testing/test_laravel-framework
-        INFRADB=${INFRADB} CONNECTOR=${CONNECTOR} ./run-tests.bash
+        ./run-tests.bash
         RC=$?
         
         #sudo chmod -R 777 ${{ github.workspace }}/*
diff --git a/.github/workflows/ci-3p-mariadb-connector-c.yml b/.github/workflows/ci-3p-mariadb-connector-c.yml
index 7ad338b28..bc36cc27e 100644
--- a/.github/workflows/ci-3p-mariadb-connector-c.yml
+++ b/.github/workflows/ci-3p-mariadb-connector-c.yml
@@ -92,7 +92,8 @@ jobs:
         
         cd proxysql_3p_testing/
         git sparse-checkout list
-        ./setup.sh
+        ./setup.sh test_mariadb-connector-c/mariadb-connector-c
+        git switch ${{ env.TESTTREE }}
         #git -C ./proxysql switch ${{ env.SHA }}
         #git -C ./proxysql pull --tags
         
diff --git a/.github/workflows/ci-3p-mysql-connector-j.yml b/.github/workflows/ci-3p-mysql-connector-j.yml
index 700eb87c6..a50933141 100644
--- a/.github/workflows/ci-3p-mysql-connector-j.yml
+++ b/.github/workflows/ci-3p-mysql-connector-j.yml
@@ -91,8 +91,8 @@ jobs:
         set +e
         
         cd proxysql_3p_testing/
-        git sparse-checkout list
-        ./setup.sh
+        ./setup.sh test_mysql-connector-j/mysql-connector-j
+        git switch ${{ env.TESTTREE }}
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql .
diff --git a/.github/workflows/ci-3p-php-pdo-mysql.yml b/.github/workflows/ci-3p-php-pdo-mysql.yml
index 40c913f8d..aa116d99a 100644
--- a/.github/workflows/ci-3p-php-pdo-mysql.yml
+++ b/.github/workflows/ci-3p-php-pdo-mysql.yml
@@ -91,9 +91,9 @@ jobs:
         set +e
         
         cd proxysql_3p_testing/
-        git sparse-checkout list
-        ./setup.sh
-        
+        ./setup.sh test_php-pdo-mysql/php-src
+        git switch ${{ env.TESTTREE }}
+
         # use cached build
         rm -rf ./proxysql && mv ../proxysql .
 
diff --git a/.github/workflows/ci-3p-postgresql.yml b/.github/workflows/ci-3p-postgresql.yml
index 8cdf25b5e..e1461c9fc 100644
--- a/.github/workflows/ci-3p-postgresql.yml
+++ b/.github/workflows/ci-3p-postgresql.yml
@@ -87,17 +87,17 @@ jobs:
       run: |
         set +e
         
-        ulimit -c unlimited
-        echo '/core' | sudo tee /proc/sys/kernel/core_pattern
-        echo "==================================="
-        ulimit -c
-        echo "==================================="
-        cat /proc/sys/kernel/core_pattern
-        echo "==================================="
+        #ulimit -c unlimited
+        #echo '/core' | sudo tee /proc/sys/kernel/core_pattern
+        #echo "==================================="
+        #ulimit -c
+        #echo "==================================="
+        #cat /proc/sys/kernel/core_pattern
+        #echo "==================================="
         
         cd proxysql_3p_testing/
-        #git sparse-checkout list
         ./setup.sh test_postgresql/postgresql
+        git switch ${{ env.TESTTREE }}
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql .
diff --git a/.github/workflows/ci-3p-sqlalchemy.yml b/.github/workflows/ci-3p-sqlalchemy.yml
index aca9d3167..678366a39 100644
--- a/.github/workflows/ci-3p-sqlalchemy.yml
+++ b/.github/workflows/ci-3p-sqlalchemy.yml
@@ -98,6 +98,7 @@ jobs:
 
         cd proxysql_3p_testing/
         ./setup.sh test_sqlalchemy/sqlalchemy
+        git switch ${{ env.TESTTREE }}
 
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true
@@ -107,8 +108,8 @@ jobs:
         set +e
         
         cd proxysql_3p_testing/test_sqlalchemy
-        #INFRADB=${{ matrix.infradb }} CONNECTOR=${{ matrix.connector }} ./run-tests.bash test/dialect
-        INFRADB=${{ matrix.infradb }} CONNECTOR=${{ matrix.connector }} ./run-tests.bash
+        #./run-tests.bash test/dialect
+        ./run-tests.bash
         RC=$?
         
         #sudo chmod -R 777 ${{ github.workspace }}/*