diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 999f7b3b8..7600f17b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,6 +125,7 @@ jobs: env: MATRIX_JOBS: 5 GITHUB_PR_NUMBER: ${{ github.event.number }} + GITHUB_REF: ${{ github.ref }} RNG_SEED: ${{ github.event.inputs.matrix_rng_seed }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/matrix.mjs b/.github/workflows/matrix.mjs index 7bedba9a0..f9fda5d50 100644 --- a/.github/workflows/matrix.mjs +++ b/.github/workflows/matrix.mjs @@ -72,6 +72,12 @@ matrix.addAxis({ ] }); +const addHeadPgVersion = (process.env.GITHUB_REF || '').startsWith('refs/heads/'); + +if (addHeadPgVersion) { + matrix.axisByName.pg_version.values.push('HEAD') +} + matrix.addAxis({ name: 'tz', title: x => 'client_tz ' + x, @@ -235,6 +241,9 @@ matrix.generateRow({java_version: eaJava}); // Ensure we have a job with the minimal and maximal PostgreSQL versions matrix.generateRow({pg_version: matrix.axisByName.pg_version.values[0]}); matrix.generateRow({pg_version: matrix.axisByName.pg_version.values.slice(-1)[0]}); +if (addHeadPgVersion) { + matrix.generateRow({pg_version: matrix.axisByName.pg_version.values.slice(-2)[0]}); +} //Ensure at least one job with "simple" query_mode exists matrix.generateRow({query_mode: {value: 'simple'}}); // Ensure there will be at least one job with minimal supported Java