diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec6bf86..d31e80c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/Makefile b/Makefile index d463fc2..266e0b9 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 - diff --git a/NEWS.rst b/NEWS.rst deleted file mode 100644 index c31614a..0000000 --- a/NEWS.rst +++ /dev/null @@ -1,8 +0,0 @@ -NEWS -==== - -v3.3.1 - 2019-11-28 -------------------- - -* [fix] Sync version numbers - diff --git a/debian/changelog b/debian/changelog index 2ba38a6..0945607 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pgq-node (3.4-1) unstable; urgency=low + + * v3.4 + + -- Marko Kreen Thu, 09 Jul 2020 18:37:02 +0300 + pgq-node (3.3.1-1) unstable; urgency=low * v3.3.1 diff --git a/docs/notes/v3.4.md b/docs/notes/v3.4.md new file mode 100644 index 0000000..c8ea485 --- /dev/null +++ b/docs/notes/v3.4.md @@ -0,0 +1,2 @@ +* Set up Github actions +* Support Postgres 13 diff --git a/docs/release.txt b/docs/release.txt index d3f20f6..d8088e0 100644 --- a/docs/release.txt +++ b/docs/release.txt @@ -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 diff --git a/mk/common-pgxs.mk b/mk/common-pgxs.mk index 463d632..1bd58fc 100644 --- a/mk/common-pgxs.mk +++ b/mk/common-pgxs.mk @@ -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: @@ -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 + diff --git a/pgq_node.control b/pgq_node.control index 42dc745..ad318f2 100644 --- a/pgq_node.control +++ b/pgq_node.control @@ -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'