Skip to content

Commit

Permalink
v3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
markokr committed Jul 9, 2020
1 parent 2e6c643 commit 218f552
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 23 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@ on:
jobs:

linux:
name: "Linux + PostgreSQL ${{matrix.PGVER}}"
name: "Ubuntu 18.04 + PostgreSQL ${{matrix.PGVER}}"
runs-on: ubuntu-18.04
strategy:
matrix:
PGVER:
- 10
- 11
- 12
- 13
PGVER: [10, 11, 12, 13]
steps:
- name: "Checkout"
uses: actions/checkout@v2
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

EXTENSION = pgq_node

EXT_VERSION = 3.3.1
EXT_OLD_VERSIONS = 3.2 3.2.5
EXT_VERSION = 3.4
EXT_OLD_VERSIONS = 3.2 3.2.5 3.3.1

Extension_regress = pgq_node_init_ext pgq_node_test
Contrib_regress = pgq_node_init_noext pgq_node_test
Expand All @@ -27,7 +27,3 @@ deb:
debclean:
make -f debian/rules debclean

TARNAME = $(EXTENSION)-$(EXT_VERSION)
dist:
git archive --format=tar.gz --prefix=$(TARNAME)/ -o $(TARNAME).tar.gz HEAD

8 changes: 0 additions & 8 deletions NEWS.rst

This file was deleted.

6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
pgq-node (3.4-1) unstable; urgency=low

* v3.4

-- Marko Kreen <[email protected]> Thu, 09 Jul 2020 18:37:02 +0300

pgq-node (3.3.1-1) unstable; urgency=low

* v3.3.1
Expand Down
2 changes: 2 additions & 0 deletions docs/notes/v3.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Set up Github actions
* Support Postgres 13
5 changes: 4 additions & 1 deletion docs/release.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

follow pgq/docs/release.txt
* Set new version number in .control, Makefile, debian/changelog
* Add release notes to docs/notes
* git commit -m "vX.Y"
* "make release" to tag and push it out

22 changes: 21 additions & 1 deletion mk/common-pgxs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ test: install
$(MAKE) installcheck || { filterdiff --format=unified regression.diffs | less; exit 1; }
pg_dump regression > test.dump

citest:
citest: checkver
$(MAKE) installcheck || { filterdiff --format=unified regression.diffs; exit 1; }

ack:
Expand Down Expand Up @@ -142,3 +142,23 @@ structure/oldgrants_$(EXTENSION).sql: structure/grants.ini structure/grants.sql
cat structure/grants.sql >> $@
echo "commit;" >> $@

checkver:
@echo "Checking version numbers"
@grep -q "^default_version *= *'$(EXT_VERSION)'" $(EXTENSION).control \
|| { echo "ERROR: $(EXTENSION).control has wrong version"; exit 1; }
@test -f "docs/notes/v$(EXT_VERSION).md" \
|| { echo "ERROR: notes missing: docs/notes/v$(EXT_VERSION).md"; exit 1; }
@head debian/changelog | grep -q "[(]$(EXT_VERSION)-" debian/changelog \
|| { echo "ERROR: debian/changelog has wrong version"; exit 1; }

all: checkver

TARNAME = $(EXTENSION)-$(EXT_VERSION)
dist: checkver
git archive --format=tar.gz --prefix=$(TARNAME)/ -o $(TARNAME).tar.gz HEAD

release: checkver
git tag v$(EXT_VERSION)
git push github
git push github --tag

2 changes: 1 addition & 1 deletion pgq_node.control
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pgq_node
comment = 'Cascaded queue infrastructure'
default_version = '3.3.1'
default_version = '3.4'
relocatable = false
superuser = true
schema = 'pg_catalog'
Expand Down

0 comments on commit 218f552

Please sign in to comment.