run full matrix again

fix/packing-ci
Nils Dijk 2023-11-10 14:52:34 +00:00
parent 96802f9f73
commit ab1010bcdb
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 15 additions and 19 deletions

View File

@ -46,25 +46,21 @@ jobs:
# based distros # based distros
# For this reason, we need to use a "matrix" to generate names of # For this reason, we need to use a "matrix" to generate names of
# rpm images, e.g. citus/packaging:centos-7-pg12 # rpm images, e.g. citus/packaging:centos-7-pg12
# packaging_docker_image: packaging_docker_image:
# - oraclelinux-8 - centos-7
# - almalinux-8 - oraclelinux-7
# - almalinux-9 - oraclelinux-8
# POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} - almalinux-8
# POSTGRES_VERSION: - almalinux-9
# - 16 POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}
# Postgres removed support for CentOS 7 in PG 16. Below block is needed to # Postgres removed support for CentOS 7 in PG 16. Below block is needed to
# keep the build for CentOS 7 working for PG 14 and PG 15. # keep the build for CentOS 7 working for PG 14 and PG 15.
# Once dependent systems drop support for Centos 7, we can remove this block. # Once dependent systems drop support for Centos 7, we can remove this block.
include: exclude:
# - packaging_docker_image: centos-7 - packaging_docker_image: centos-7
# POSTGRES_VERSION: 14 POSTGRES_VERSION: 16
# - packaging_docker_image: centos-7
# POSTGRES_VERSION: 15
# - packaging_docker_image: oraclelinux-7
# POSTGRES_VERSION: 14
- packaging_docker_image: oraclelinux-7 - packaging_docker_image: oraclelinux-7
POSTGRES_VERSION: 15 POSTGRES_VERSION: 16
container: container:
image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }}
@ -130,10 +126,10 @@ jobs:
# for each deb based image and we use POSTGRES_VERSION to set # for each deb based image and we use POSTGRES_VERSION to set
# PG_CONFIG variable in each of those runs. # PG_CONFIG variable in each of those runs.
packaging_docker_image: packaging_docker_image:
# - debian-buster-all - debian-buster-all
# - debian-bookworm-all - debian-bookworm-all
# - debian-bullseye-all - debian-bullseye-all
# - ubuntu-focal-all - ubuntu-focal-all
- ubuntu-jammy-all - ubuntu-jammy-all
POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}