Skip to content

Add postgresql 18 testing #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 1, 2025
Merged

Add postgresql 18 testing #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b693b1c
Limit duplicate test runs of core+ext tests
austb Nov 1, 2025
2af583a
Move integration tests into GHA matrix
austb Nov 1, 2025
c3d9bd7
Add testing for postgresql 18
austb Nov 1, 2025
ec42c33
ext test: accept new string for psql output
austb Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
# converted to "_" in the pdb-job-id below.

flavor:
- core+ext/openjdk21/pg-17
- core+ext/openjdk21/pg-16
- core+ext/openjdk17/pg-17
- core+ext/openjdk17/pg-16

# terminus rspec tests
- rspec/pup-main
- lint/openjdk17
# agent, server, db integration tests
- int/openjdk17/pup-main/srv-main/pg-16/rich
- int/openjdk21/pup-main/srv-main/pg-17/rich
- int/openjdk21/pup-main/srv-main/pg-18/rich


os: [ubuntu-24.04]
ruby: ['3.2', '3.3', '3.4']
Expand All @@ -41,23 +41,30 @@ jobs:

# Special cases
include:
# integration
- flavor: int/openjdk17/pup-main/srv-main/pg-16/rich
# lint
- flavor: lint/openjdk17
os: ubuntu-24.04
ruby: '3.2'
- flavor: int/openjdk17/pup-main/srv-main/pg-16/rich
ruby: '3.4'

# unit
# jdk 21
- flavor: core+ext/openjdk21/pg-18
os: ubuntu-24.04
ruby: '3.3'
- flavor: int/openjdk17/pup-main/srv-main/pg-16/rich
ruby: '3.4'
- flavor: core+ext/openjdk21/pg-17
os: ubuntu-24.04
ruby: '3.4'
- flavor: int/openjdk21/pup-main/srv-main/pg-17/rich
- flavor: core+ext/openjdk21/pg-16
os: ubuntu-24.04
ruby: '3.2'
- flavor: int/openjdk21/pup-main/srv-main/pg-17/rich
ruby: '3.4'
# jdk 17
- flavor: core+ext/openjdk17/pg-18
os: ubuntu-24.04
ruby: '3.4'
- flavor: core+ext/openjdk17/pg-17
os: ubuntu-24.04
ruby: '3.3'
- flavor: int/openjdk21/pup-main/srv-main/pg-17/rich
ruby: '3.4'
- flavor: core+ext/openjdk17/pg-16
os: ubuntu-24.04
ruby: '3.4'

Expand Down
4 changes: 3 additions & 1 deletion ext/test/upgrade-and-exit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ psql -U puppetdb puppetdb -c '\dt' >"$tmpdir/out" 2>"$tmpdir/err"
cat "$tmpdir/out"
cat "$tmpdir/err"
# Output moved to err and changed as of at least pg 11
# Output string on err changed to "tables" in pg18
grep 'No relations found' "$tmpdir/out" \
|| grep 'Did not find any relations' "$tmpdir/err"
|| grep 'Did not find any relations' "$tmpdir/err" \
|| grep 'Did not find any tables' "$tmpdir/err"

# Run upgrade
./pdb upgrade -c "$PDBBOX/conf.d"
Expand Down
Loading