Skip to content

Commit

Permalink
Add pg13 to CI build matrix
Browse files Browse the repository at this point in the history
Since the actual tests have not been adjusted for PG13 yet this
only checks compiling against PG13. A subsequent PR will enable
tests for PG13.
  • Loading branch information
svenklemm committed Jan 15, 2021
1 parent 07535b3 commit 905a897
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/linux-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,21 @@ jobs:

- name: make installcheck
id: installcheck
if: matrix.pg != '13.1'
run: |
set -o pipefail
make -k -C build installcheck ${{ matrix.installcheck_args }} | tee installcheck.log
- name: pginstallcheck
if: matrix.pg != '13.1'
run: make -C build pginstallcheck

- name: coverage
if: matrix.coverage
if: matrix.coverage && matrix.pg != '13.1'
run: make -j $MAKE_JOBS -k -C build coverage

- name: Upload coverage report
if: matrix.coverage
if: matrix.coverage && matrix.pg != '13.1'
uses: codecov/codecov-action@v1
with:
file: ./build/codecov/timescaledb-codecov.info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
pg: [ 11, 12 ]
pg: [ 11, 12, 13 ]
os: [ windows-2019 ]
build_type: [ Debug, Release ]
env:
Expand Down
5 changes: 4 additions & 1 deletion scripts/gh_matrix_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
PG11_LATEST = "11.10"
PG12_EARLIEST = "12.0"
PG12_LATEST = "12.5"
PG13_EARLIEST = "13.0"
PG13_LATEST = "13.1"

m = {"include": [],}

Expand Down Expand Up @@ -92,9 +94,10 @@ def macos_config(overrides):
base_config.update(overrides)
return base_config

# always test debug build on latest pg11 and latest pg12
# always test debug build on latest pg 11, 12, 13
m["include"].append(build_debug_config({"pg":PG11_LATEST}))
m["include"].append(build_debug_config({"pg":PG12_LATEST}))
m["include"].append(build_debug_config({"pg":PG13_LATEST}))

m["include"].append(build_release_config(macos_config({})))

Expand Down

0 comments on commit 905a897

Please sign in to comment.