use correct matrix vars

sysown · Oct 8, 2024 · e44fa54 · e44fa54
1 parent a262473
commit e44fa54
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/CI-3p-django-framework.yml b/.github/workflows/CI-3p-django-framework.yml
@@ -18,23 +18,23 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+      infradb: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_infradb_mysql }}
+      connector: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_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-django-framework.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mariadb }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
+      infradb: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_infradb_mariadb }}
+      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 }}
     uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_pgsql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_pgsql }}
+      infradb: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_infradb_pgsql }}
+      connector: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_connector_pgsql }}
diff --git a/.github/workflows/CI-3p-laravel-framework.yml b/.github/workflows/CI-3p-laravel-framework.yml
@@ -18,21 +18,23 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+      infradb: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_infradb_mysql }}
+      connector: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_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-laravel-framework.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mariadb }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
+      infradb: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_infradb_mariadb }}
+      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 }}
     uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_pgsql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_pgsql }}
+      infradb: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_infradb_pgsql }}
+      connector: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_connector_pgsql }}
diff --git a/.github/workflows/CI-3p-mariadb-connector-c.yml b/.github/workflows/CI-3p-mariadb-connector-c.yml
@@ -18,5 +18,5 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+      infradb: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_infradb_mysql }}
+      connector: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_connector_mysql }}
diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml
@@ -18,5 +18,5 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+      infradb: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_infradb_mysql }}
+      connector: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_connector_mysql }}
diff --git a/.github/workflows/CI-3p-php-pdo-mysql.yml b/.github/workflows/CI-3p-php-pdo-mysql.yml
@@ -18,5 +18,5 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
-      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+      infradb: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_infradb_mysql }}
+      connector: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_connector_mysql }}
diff --git a/.github/workflows/CI-taptests-groups.yml b/.github/workflows/CI-taptests-groups.yml
@@ -18,4 +18,4 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      testgroup: ${{ vars.MATRIX_TAP_GROUPS_testgroup }}
+      testgroup: ${{ vars.MATRIX_TAPTESTS_GROUPS_testgroup }}
diff --git a/.github/workflows/CI-taptests.yml b/.github/workflows/CI-taptests.yml
@@ -18,4 +18,4 @@ jobs:
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
-      testgroup: ${{ vars.MATRIX_TAP_GROUPS_testgroup }}
+      testgroup: ${{ vars.MATRIX_TAPTESTS_GROUPS_testgroup }}