[6.0] 3aa711b6e [cci] fix package revision

Guillaume Quintard guillaume at varnish-software.com
Sat Oct 24 00:34:07 UTC 2020


commit 3aa711b6e37da39159f2aa4fc6b8fd5c95d19d22
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Fri Oct 23 15:02:29 2020 -0700

    [cci] fix package revision

diff --git a/.circleci/make-deb-packages.sh b/.circleci/make-deb-packages.sh
index 3b3ba0847..8437de094 100755
--- a/.circleci/make-deb-packages.sh
+++ b/.circleci/make-deb-packages.sh
@@ -38,8 +38,8 @@ if [ -e .is_weekly ]; then
 else
     WEEKLY=
 fi
-VERSION=$(./configure --version | awk 'NR == 1 {print $NF}')$WEEKLY~$PARAM_RELEASE
-sed -i -e "s|@VERSION@|$VERSION-1|"  "debian/changelog"
+VERSION=$(./configure --version | awk 'NR == 1 {print $NF}')$WEEKLY-1~$PARAM_RELEASE
+sed -i -e "s|@VERSION@|$VERSION|"  "debian/changelog"
 
 echo "Install Build-Depends packages..."
 yes | mk-build-deps --install debian/control || true
diff --git a/.circleci/make-rpm-packages.sh b/.circleci/make-rpm-packages.sh
index b443c9139..5f7d0af1a 100755
--- a/.circleci/make-rpm-packages.sh
+++ b/.circleci/make-rpm-packages.sh
@@ -60,7 +60,7 @@ rpmbuild() {
         --define "_srcrpmdir $CUR_DIR/${RESULT_DIR}" \
         --define "_rpmdir $CUR_DIR/${RESULT_DIR}" \
         --define "versiontag ${RPMVERSION}" \
-        --define "releasetag 0.0" \
+        --define "releasetag 1" \
         --define "srcname $DIST_DIR" \
         --define "nocheck 1" \
         "$@"


More information about the varnish-commit mailing list