From e44fa545fa3ddcce9bec1e62c994dbacd669cb25 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 8 Oct 2024 12:31:52 +0200 Subject: [PATCH] use correct matrix vars --- .github/workflows/CI-3p-django-framework.yml | 12 ++++++------ .github/workflows/CI-3p-laravel-framework.yml | 14 ++++++++------ .github/workflows/CI-3p-mariadb-connector-c.yml | 4 ++-- .github/workflows/CI-3p-mysql-connector-j.yml | 4 ++-- .github/workflows/CI-3p-php-pdo-mysql.yml | 4 ++-- .github/workflows/CI-taptests-groups.yml | 2 +- .github/workflows/CI-taptests.yml | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/CI-3p-django-framework.yml b/.github/workflows/CI-3p-django-framework.yml index 9a4b2c0a1..f6a268931 100644 --- a/.github/workflows/CI-3p-django-framework.yml +++ b/.github/workflows/CI-3p-django-framework.yml @@ -18,8 +18,8 @@ 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 }} @@ -27,8 +27,8 @@ jobs: 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 }} @@ -36,5 +36,5 @@ jobs: 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 index 0424349e9..e81c2767c 100644 --- 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 index b01523bef..ff91199ba 100644 --- 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 index 663dd909d..588d65c9d 100644 --- 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 index 2a3b9bea4..e8b3ece8f 100644 --- 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 index cb75b6a3a..01f8ea76f 100644 --- 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 index 607f85711..73b236ad7 100644 --- 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 }}