From 9a58ee609af0a709c0b9827081669af31ec82793 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Fri, 14 Oct 2022 13:42:04 -0700 Subject: [PATCH] Added Postgres 15 to CI --- .github/workflows/build.yml | 10 +++++----- Makefile | 3 +++ test/perl/PostgresNode.pm | 8 ++++++++ test/perl/TestLib.pm | 3 +++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 test/perl/PostgresNode.pm create mode 100644 test/perl/TestLib.pm diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19ad72d..510144e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,12 +7,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - postgres: [14, 13, 12, 11, 10, 9.6] + postgres: [15, 14, 13, 12, 11, 10, 9.6] include: - os: macos-latest postgres: 14 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ankane/setup-postgres@v1 with: postgres-version: ${{ matrix.postgres }} @@ -33,6 +33,6 @@ jobs: - if: ${{ startsWith(matrix.os, 'macos') }} run: | brew install cpanm && cpanm IPC::Run - wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_4.tar.gz - tar xf REL_14_4.tar.gz - make prove_installcheck PROVE=prove PERL5LIB="postgres-REL_14_4/src/test/perl:/Users/runner/perl5/lib/perl5" + wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_5.tar.gz + tar xf REL_14_5.tar.gz + make prove_installcheck PROVE=prove PERL5LIB="postgres-REL_14_5/src/test/perl:/Users/runner/perl5/lib/perl5" diff --git a/Makefile b/Makefile index 173c64d..3a81dec 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,9 @@ PG_CONFIG ?= pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) +# for Postgres 15 +PROVE_FLAGS += -I ./test/perl + prove_installcheck: rm -rf $(CURDIR)/tmp_check cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),test/t/*.pl) diff --git a/test/perl/PostgresNode.pm b/test/perl/PostgresNode.pm new file mode 100644 index 0000000..32ffb95 --- /dev/null +++ b/test/perl/PostgresNode.pm @@ -0,0 +1,8 @@ +use PostgreSQL::Test::Cluster; + +sub get_new_node +{ + return PostgreSQL::Test::Cluster->new(@_); +} + +1; diff --git a/test/perl/TestLib.pm b/test/perl/TestLib.pm new file mode 100644 index 0000000..1cb2a82 --- /dev/null +++ b/test/perl/TestLib.pm @@ -0,0 +1,3 @@ +use PostgreSQL::Test::Utils; + +1;