From f2b39f11a3fb166db84531be9bcacfbc69227bf5 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 17 Sep 2025 16:10:04 +0200 Subject: [PATCH] always use debug build for 3p tests --- .github/workflows/ci-3p-aiomysql.yml | 2 +- .github/workflows/ci-3p-django-framework.yml | 2 +- .github/workflows/ci-3p-laravel-framework.yml | 2 +- .github/workflows/ci-3p-mariadb-connector-c.yml | 2 +- .github/workflows/ci-3p-mysql-connector-j.yml | 2 +- .github/workflows/ci-3p-pgjdbc.yml | 5 ++--- .github/workflows/ci-3p-php-pdo-mysql.yml | 2 +- .github/workflows/ci-3p-php-pdo-pgsql.yml | 2 +- .github/workflows/ci-3p-postgresql.yml | 2 +- .github/workflows/ci-3p-sqlalchemy.yml | 2 +- .github/workflows/ci-builds.yml | 13 +++---------- 11 files changed, 14 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci-3p-aiomysql.yml b/.github/workflows/ci-3p-aiomysql.yml index 55a7f5b60..40c9d2c9c 100644 --- a/.github/workflows/ci-3p-aiomysql.yml +++ b/.github/workflows/ci-3p-aiomysql.yml @@ -34,7 +34,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-django-framework.yml b/.github/workflows/ci-3p-django-framework.yml index d82ad41d9..cff398cfc 100644 --- a/.github/workflows/ci-3p-django-framework.yml +++ b/.github/workflows/ci-3p-django-framework.yml @@ -34,7 +34,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-laravel-framework.yml b/.github/workflows/ci-3p-laravel-framework.yml index 835a39cdb..abe392e4b 100644 --- a/.github/workflows/ci-3p-laravel-framework.yml +++ b/.github/workflows/ci-3p-laravel-framework.yml @@ -34,7 +34,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-mariadb-connector-c.yml b/.github/workflows/ci-3p-mariadb-connector-c.yml index 9f11850f0..f2536686d 100644 --- a/.github/workflows/ci-3p-mariadb-connector-c.yml +++ b/.github/workflows/ci-3p-mariadb-connector-c.yml @@ -34,7 +34,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-mysql-connector-j.yml b/.github/workflows/ci-3p-mysql-connector-j.yml index 8c8ad69dd..1953f43d2 100644 --- a/.github/workflows/ci-3p-mysql-connector-j.yml +++ b/.github/workflows/ci-3p-mysql-connector-j.yml @@ -34,7 +34,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-pgjdbc.yml b/.github/workflows/ci-3p-pgjdbc.yml index 9c32f9bef..290f60778 100644 --- a/.github/workflows/ci-3p-pgjdbc.yml +++ b/.github/workflows/ci-3p-pgjdbc.yml @@ -14,8 +14,7 @@ on: type: string env: -# TESTTREE: ${{ inputs.testtree || inputs.trigger.event.inputs.testtree || 'main' }} - TESTTREE: add_pgjdbc + TESTTREE: ${{ inputs.testtree || inputs.trigger.event.inputs.testtree || 'main' }} TESTNAME: pgjdbc TESTDIST: debian12 SHA: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }} @@ -32,7 +31,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-php-pdo-mysql.yml b/.github/workflows/ci-3p-php-pdo-mysql.yml index 9585eb2b5..8c3169ec0 100644 --- a/.github/workflows/ci-3p-php-pdo-mysql.yml +++ b/.github/workflows/ci-3p-php-pdo-mysql.yml @@ -34,7 +34,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-php-pdo-pgsql.yml b/.github/workflows/ci-3p-php-pdo-pgsql.yml index 7691d14d5..c86aa6499 100644 --- a/.github/workflows/ci-3p-php-pdo-pgsql.yml +++ b/.github/workflows/ci-3p-php-pdo-pgsql.yml @@ -31,7 +31,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-postgresql.yml b/.github/workflows/ci-3p-postgresql.yml index c8b2bb01d..805578da4 100644 --- a/.github/workflows/ci-3p-postgresql.yml +++ b/.github/workflows/ci-3p-postgresql.yml @@ -31,7 +31,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' steps: diff --git a/.github/workflows/ci-3p-sqlalchemy.yml b/.github/workflows/ci-3p-sqlalchemy.yml index f737ca1f4..ecf5bda08 100644 --- a/.github/workflows/ci-3p-sqlalchemy.yml +++ b/.github/workflows/ci-3p-sqlalchemy.yml @@ -35,7 +35,7 @@ jobs: env: INFRADB: ${{ matrix.infradb }} CONNECTOR: ${{ matrix.connector }} - BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin + BLDCACHE: ${{ inputs.trigger && fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12-dbg_bin MATRIX: '(${{ matrix.infradb }},${{ matrix.connector }})' outputs: summary: ${{ steps.check_baseline.outputs.summary }} diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml index 773d5fdc2..0d6f84cd3 100644 --- a/.github/workflows/ci-builds.yml +++ b/.github/workflows/ci-builds.yml @@ -50,20 +50,13 @@ jobs: fail-fast: false matrix: include: -# - dist: 'centos7' -# type: '' -# - dist: 'debian10' -# type: '' - # debian11 is needed for 3p testing -# - dist: 'debian11' -# type: '' + # debian12 is needed for 3p testing - dist: 'debian12' - type: '' + type: '-dbg' # - dist: 'opensuse15' # type: '-clang' -# - dist: 'ubuntu16' -# type: '' + # ubuntu22 is needed for TAP testing - dist: 'ubuntu22' type: '-tap'