Skip to content

Commit

Permalink
Enable CI tests
Browse files Browse the repository at this point in the history
Caught some issues around install scripts and use of PostgreSQL 16–only features. Merging with failures and fixing soon.
  • Loading branch information
jasonmp85 authored Mar 13, 2024
1 parent 30aa60b commit 3372714
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 5 deletions.
54 changes: 54 additions & 0 deletions .github/workflows/installcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: PostgreSQL Installcheck

on:
pull_request:
types: [opened, edited, reopened, review_requested]

jobs:
installcheck:
strategy:
matrix:
pg_version: [14, 15, 16]
os: [ubuntu-latest]

runs-on: ${{matrix.os}}
steps:
- name: Add PGDG repo
run: >
sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' &&
sudo sh -c 'wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg' &&
sudo apt-get update
- name: Install/modify postgresql-common
run: >
sudo apt-get install -y --no-install-recommends postgresql-common &&
sudo sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf
- name: Install PostgreSQL and server-dev
run: >
sudo apt-get install -y --no-install-recommends \
postgresql-${{matrix.pg_version}} \
postgresql-server-dev-${{matrix.pg_version}}
- name: Install dependencies
run: >
sudo apt-get install -y --no-install-recommends \
postgresql-${{matrix.pg_version}}-partman
- uses: actions/checkout@v3

- name: Install extension
run: sudo make install

- name: Start PostgreSQL
run: >
sudo pg_dropcluster 14 main &&
sudo pg_createcluster ${{matrix.pg_version}} main --start -- -A trust
- name: Test extension
id: installcheck
run: PGUSER=postgres PGCLUSTER=${{matrix.pg_version}}/main make installcheck

- name: Display results
if: failure() && steps.installcheck.outcome != 'success'
run: cat regression.diffs
4 changes: 2 additions & 2 deletions .github/workflows/trunk_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
branches:
- main
paths-ignore:
- 'README.md'
- "README.md"
push:
branches:
- main
paths-ignore:
- 'README.md'
- "README.md"

release:
types:
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
results/

# ignore latest install file
timeseries--?.?.?.sql
!timeseries--?.?.?--?.?.?.sql
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ EXTVERSION = $(shell grep -m 1 '[[:space:]]\{8\}"version":' META.json | \
DISTVERSION = $(shell grep -m 1 '[[:space:]]\{3\}"version":' META.json | \
sed -e 's/[[:space:]]*"version":[[:space:]]*"\([^"]*\)",\{0,1\}/\1/')

EXTVERSIONS = 0.1.0 0.1.1

DATA = $(wildcard sql/*--*.sql)
DATA_built = $(foreach v,$(EXTVERSIONS),sql/$(EXTENSION)--$(v).sql)

DOCS = $(wildcard doc/*.md)
TESTS = $(wildcard test/sql/*.sql)
REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))
Expand All @@ -18,11 +22,15 @@ include $(PGXS)

all: sql/$(EXTENSION)--$(EXTVERSION).sql

sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
cp $< $@

dist:
git archive --format zip --prefix=$(EXTENSION)-$(DISTVERSION)/ -o $(EXTENSION)-$(DISTVERSION).zip HEAD

latest-changes.md: Changes
perl -e 'while (<>) {last if /^(v?\Q${DISTVERSION}\E)/; } print "Changes for v${DISTVERSION}:\n"; while (<>) { last if /^\s*$$/; s/^\s+//; print }' Changes > $@

# generate each version's file installation file by concatenating
# previous upgrade scripts
sql/$(EXTENSION)--0.1.0.sql: sql/$(EXTENSION).sql
cat $^ > $@
sql/$(EXTENSION)--0.1.1.sql: sql/$(EXTENSION)--0.1.0.sql sql/$(EXTENSION)--0.1.0--0.1.1.sql
cat $^ > $@
1 change: 1 addition & 0 deletions sql/timeseries--0.1.0--0.1.1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-- empty upgrade, version number only

0 comments on commit 3372714

Please sign in to comment.