From 44f04aff78f642cef48889225d17e6b84a135329 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 11 Jun 2024 16:59:21 +0000 Subject: [PATCH] Bump pgloader minor version and add checks The version number in `pgloader --version` was missed in the last few releases. --- debian/rules | 3 +++ src/params.lisp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 37f902e5..d2089c96 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,8 @@ MAKEFILE_VERSION = $(shell awk '/^VERSION/ { print $$3 }' Makefile) DOC_VERSION = $(shell awk '/^release/ { print $$3 }' docs/conf.py | tr -d "'") SPECFILE_VERSION = $(shell awk '/^Version/ { print $$2 }' pgloader.spec) DEBIAN_VERSION = $(shell dpkg-parsechangelog -SVersion | cut -d- -f 1) +PGLOADER_MAJOR_VERSION = $(shell awk '/^.defparameter .major-version/ { print $$3 }' src/params.lisp | grep -Eo '[0-9.]+') +PGLOADER_MINOR_VERSION = $(shell awk '/^.defparameter .minor-version/ { print $$3 }' src/params.lisp | grep -Eo '[0-9.]+') # buildd provides a build environment where $HOME is not writable, but the # CL compilers here will need to fill-in a per-user cache @@ -30,6 +32,7 @@ override_dh_auto_clean: [ "$(MAKEFILE_VERSION)" = "$(DOC_VERSION)" ] # Makefile = docs/conf.py version [ "$(MAKEFILE_VERSION)" = "$(SPECFILE_VERSION)" ] # Makefile = pgloader.spec version [ "$(MAKEFILE_VERSION)" = "$(DEBIAN_VERSION)" ] # Makefile = debian/changelog version + [ "$(MAKEFILE_VERSION)" = "$(PGLOADER_MAJOR_VERSION).$(PGLOADER_MINOR_VERSION)" ] # Makefile = src/params.lisp version override_dh_auto_build-indep: # do nothing diff --git a/src/params.lisp b/src/params.lisp index 4f8ddaab..eeaef9f6 100644 --- a/src/params.lisp +++ b/src/params.lisp @@ -44,7 +44,7 @@ "non-nil when this build is a release build.") (defparameter *major-version* "3.6") -(defparameter *minor-version* "7") +(defparameter *minor-version* "10") (defun git-hash () "Return the current abbreviated git hash of the development tree."