From 1fa73aacc5a7ba92fd03e7744519dc6e139120f6 Mon Sep 17 00:00:00 2001
From: Miro Stauder <miro@proxysql.com>
Date: Thu, 19 Dec 2024 10:02:03 +0100
Subject: [PATCH 1/2] add workflow_dispatch inputs add run-mariadb where
 missing make run-pgsql conditional

---
 .github/workflows/CI-3p-django-framework.yml    |  9 ++++++++-
 .github/workflows/CI-3p-laravel-framework.yml   |  9 ++++++++-
 .github/workflows/CI-3p-mariadb-connector-c.yml | 16 +++++++++++++++-
 .github/workflows/CI-3p-mysql-connector-j.yml   | 16 +++++++++++++++-
 .github/workflows/CI-3p-php-pdo-mysql.yml       | 16 +++++++++++++++-
 .github/workflows/CI-3p-postgresql.yml          | 11 +++++++++--
 .github/workflows/CI-3p-sqlalchemy.yml          |  9 ++++++++-
 7 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/CI-3p-django-framework.yml b/.github/workflows/CI-3p-django-framework.yml
index f6a268931..fa5d8e56d 100644
--- a/.github/workflows/CI-3p-django-framework.yml
+++ b/.github/workflows/CI-3p-django-framework.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -31,7 +36,9 @@ jobs:
       connector: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_connector_mariadb }}
 
   run-pgsql:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
     uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
     secrets: inherit
     with:
diff --git a/.github/workflows/CI-3p-laravel-framework.yml b/.github/workflows/CI-3p-laravel-framework.yml
index e81c2767c..a8760c02e 100644
--- a/.github/workflows/CI-3p-laravel-framework.yml
+++ b/.github/workflows/CI-3p-laravel-framework.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -31,7 +36,9 @@ jobs:
       connector: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_connector_mariadb }}
       
   run-pgsql:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
     uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
     secrets: inherit
     with:
diff --git a/.github/workflows/CI-3p-mariadb-connector-c.yml b/.github/workflows/CI-3p-mariadb-connector-c.yml
index ff91199ba..bf0e2fa30 100644
--- a/.github/workflows/CI-3p-mariadb-connector-c.yml
+++ b/.github/workflows/CI-3p-mariadb-connector-c.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-mariadb-connector-c.yml@GH-Actions
     secrets: inherit
@@ -20,3 +25,12 @@ jobs:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-mariadb-connector-c.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_connector_mariadb }}
diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml
index 588d65c9d..c388fd8a1 100644
--- a/.github/workflows/CI-3p-mysql-connector-j.yml
+++ b/.github/workflows/CI-3p-mysql-connector-j.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-mysql-connector-j.yml@GH-Actions
     secrets: inherit
@@ -20,3 +25,12 @@ jobs:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-mysql-connector-j.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_connector_mariadb }}
diff --git a/.github/workflows/CI-3p-php-pdo-mysql.yml b/.github/workflows/CI-3p-php-pdo-mysql.yml
index e8b3ece8f..2fe4a2ca4 100644
--- a/.github/workflows/CI-3p-php-pdo-mysql.yml
+++ b/.github/workflows/CI-3p-php-pdo-mysql.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-php-pdo-mysql.yml@GH-Actions
     secrets: inherit
@@ -20,3 +25,12 @@ jobs:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-php-pdo-mysql.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_connector_mariadb }}
diff --git a/.github/workflows/CI-3p-postgresql.yml b/.github/workflows/CI-3p-postgresql.yml
index 047e88783..2ec23bc38 100644
--- a/.github/workflows/CI-3p-postgresql.yml
+++ b/.github/workflows/CI-3p-postgresql.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,8 +17,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+  run-pgsql:
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
     uses: sysown/proxysql/.github/workflows/ci-3p-postgresql.yml@GH-Actions
     secrets: inherit
     with:
diff --git a/.github/workflows/CI-3p-sqlalchemy.yml b/.github/workflows/CI-3p-sqlalchemy.yml
index 347338cb9..c318df63c 100644
--- a/.github/workflows/CI-3p-sqlalchemy.yml
+++ b/.github/workflows/CI-3p-sqlalchemy.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -31,7 +36,9 @@ jobs:
       connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
 
   run-pgsql:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
     uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
     secrets: inherit
     with:

From e3a239a6c4cf63e5cec2c56594ffcad19cc81516 Mon Sep 17 00:00:00 2001
From: Miro Stauder <miro@proxysql.com>
Date: Thu, 19 Dec 2024 10:25:32 +0100
Subject: [PATCH 2/2] rephrase run-pgsql condition

---
 .github/workflows/CI-3p-django-framework.yml  | 2 +-
 .github/workflows/CI-3p-laravel-framework.yml | 2 +-
 .github/workflows/CI-3p-postgresql.yml        | 2 +-
 .github/workflows/CI-3p-sqlalchemy.yml        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI-3p-django-framework.yml b/.github/workflows/CI-3p-django-framework.yml
index fa5d8e56d..56407b2ff 100644
--- a/.github/workflows/CI-3p-django-framework.yml
+++ b/.github/workflows/CI-3p-django-framework.yml
@@ -38,7 +38,7 @@ jobs:
   run-pgsql:
     if: |
       (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
-      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
     secrets: inherit
     with:
diff --git a/.github/workflows/CI-3p-laravel-framework.yml b/.github/workflows/CI-3p-laravel-framework.yml
index a8760c02e..e37794ebd 100644
--- a/.github/workflows/CI-3p-laravel-framework.yml
+++ b/.github/workflows/CI-3p-laravel-framework.yml
@@ -38,7 +38,7 @@ jobs:
   run-pgsql:
     if: |
       (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
-      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
     secrets: inherit
     with:
diff --git a/.github/workflows/CI-3p-postgresql.yml b/.github/workflows/CI-3p-postgresql.yml
index 2ec23bc38..ae2957518 100644
--- a/.github/workflows/CI-3p-postgresql.yml
+++ b/.github/workflows/CI-3p-postgresql.yml
@@ -20,7 +20,7 @@ jobs:
   run-pgsql:
     if: |
       (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
-      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-postgresql.yml@GH-Actions
     secrets: inherit
     with:
diff --git a/.github/workflows/CI-3p-sqlalchemy.yml b/.github/workflows/CI-3p-sqlalchemy.yml
index c318df63c..c387258f1 100644
--- a/.github/workflows/CI-3p-sqlalchemy.yml
+++ b/.github/workflows/CI-3p-sqlalchemy.yml
@@ -38,7 +38,7 @@ jobs:
   run-pgsql:
     if: |
       (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
-      startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v3.')
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
     secrets: inherit
     with: