Prepare release 1.4.3 (#149)

* add inih

* add configuration file for gpservice

* Disable the UI configuration for extra args

* remove VERSION_SUFFIX

* remove ppa-publish.sh

* Use Git repo as the source for PKGBUILD

* remove VERSION_SUFFIX

* Use Git repo as the source for PKGBUILD

* add .install for PKGBUILD

* add configuration file

* Fix cmake

* Fix cmake

* Disable snap job

* update AUR packaging

* Disable the UI configuration for extra args

* improve packaging script

* update README.md

* restart gpservice after package upgrading

scripts/_archive-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-VERSION=$(cat VERSION VERSION_SUFFIX)
+VERSION="$(cat VERSION)"
 
 rm -rf ./artifacts && mkdir -p ./artifacts/{obs,aur,flatpak}
 
@@ -18,8 +18,8 @@ cp -r ./packaging/obs ./artifacts
 cp ./artifacts/*.tar.gz ./artifacts/obs/globalprotect-openconnect.tar.gz
 
 # Prepare the AUR package
-cp ./packaging/aur/PKGBUILD-git ./artifacts/aur/PKGBUILD
-cp ./artifacts/*.tar.gz ./artifacts/aur/globalprotect-openconnect.tar.gz
+cp ./packaging/aur/PKGBUILD ./artifacts/aur/PKGBUILD
+cp ./packaging/aur/gp.install ./artifacts/aur/gp.install
 
 # Prepare the flatpak package
 cp ./packaging/flatpak/com.yuezk.qt.gpclient.yml ./artifacts/flatpak

scripts/ppa-publish.sh

@@ -1,53 +0,0 @@
-#!/bin/bash -e
-
-VERSION="$(cat VERSION VERSION_SUFFIX)"
-OLD_REVISION="1"
-
-PPA_REPO="ppa:yuezk/globalprotect-openconnect-snapshot"
-
-while [[ $# -gt 0 ]]; do
-    key="$1"
-
-    case $key in
-        --stable)
-            PPA_REPO="ppa:yuezk/globalprotect-openconnect"
-            shift
-            ;;
-        "18.04")
-            DISTRIBUTION="18.04"
-            DISTRIBUTION_NAME="bionic"
-            shift
-            ;;
-        "20.04")
-            DISTRIBUTION="20.04"
-            DISTRIBUTION_NAME="focal"
-            shift
-            ;;
-        "21.04")
-            DISTRIBUTION="21.04"
-            DISTRIBUTION_NAME="hirsute"
-            shift
-            ;;
-        "21.10")
-            DISTRIBUTION="21.10"
-            DISTRIBUTION_NAME="impish"
-            shift
-            ;;
-        *)
-            echo "Unkown options $key"
-            exit 1
-            ;;
-    esac
-done
-
-[ -z $DISTRIBUTION ] && echo "The distribuation is required" && exit 1;
-
-NEW_REVISION="ppa1~ubuntu${DISTRIBUTION}"
-
-sed -i"" "1s/${VERSION}-${OLD_REVISION}/${VERSION}-${NEW_REVISION}/;1s/unstable/${DISTRIBUTION_NAME}/" debian/changelog
-debmake
-debuild -S -sa \
-    -k"${PPA_GPG_KEYID}" \
-    -p"gpg --batch --passphrase ${PPA_GPG_PASSPHRASE} --pinentry-mode loopback"
-
-dput $PPA_REPO ../globalprotect-openconnect_${VERSION}-${NEW_REVISION}_source.changes

scripts/prepare-packaging.sh

@@ -2,14 +2,13 @@
 
 OLD_VERSION=$(git tag --sort=-v:refname --list "v[0-9]*" | head -n 1 | cut -c 2-)
 NEW_VERSION="$(cat VERSION)"
-FULL_VERSION="$(cat VERSION VERSION_SUFFIX)"
 HISTORY_ENTRIES=$(git log --format="  * %s" v${OLD_VERSION}.. | cat -n | sort -uk2 | sort -n | cut -f2-)
 
 function update_debian_changelog() {
 	local OLD_CHANGELOG=$(cat debian/changelog)
 
 	cat > debian/changelog <<-EOF
-	globalprotect-openconnect (${FULL_VERSION}-1) unstable; urgency=medium
+	globalprotect-openconnect (${NEW_VERSION}-1) unstable; urgency=medium
 
 	${HISTORY_ENTRIES}
 
@@ -24,17 +23,24 @@ function update_rpm_changelog() {
 
 	cat > packaging/obs/globalprotect-openconnect.changes <<-EOF
 	-------------------------------------------------------------------
-	$(LC_ALL=en.US date -u "+%a %b %e %T %Z %Y") - k3vinyue@gmail.com - ${FULL_VERSION}
+	$(LC_ALL=en.US date -u "+%a %b %e %T %Z %Y") - k3vinyue@gmail.com - ${NEW_VERSION}
 
-	- Update to ${FULL_VERSION}
+	- Update to ${NEW_VERSION}
 	${HISTORY_ENTRIES}
 
 	${OLD_CHANGELOG}
 	EOF
 }
 
+function generate_pkgbuild() {
+	local commit_id="$(git rev-parse HEAD)"
+	local version="$(cat VERSION)"
+	sed -e "s/{COMMIT}/${commit_id}/" -e "s/{VERSION}/${version}/" packaging/aur/PKGBUILD-git.in > packaging/aur/PKGBUILD
+}
+
 # Update rpm version
-sed -i"" -re "s/(Version:\s+).+/\1${FULL_VERSION}/" packaging/obs/globalprotect-openconnect.spec
+sed -i"" -re "s/(Version:\s+).+/\1${NEW_VERSION}/" packaging/obs/globalprotect-openconnect.spec
 
 update_rpm_changelog
 update_debian_changelog
+generate_pkgbuild

scripts/release.sh

@@ -2,9 +2,6 @@
 
 VERSION=$(cat VERSION)
 
-# Clear the VERSION_SUFFIX
-cat /dev/null > VERSION_SUFFIX
-
 # Update packaging, e.g., version, changelog, etc.
 ./scripts/prepare-packaging.sh
 

scripts/snapshot-archive-all.sh

@@ -12,6 +12,3 @@ mv ./artifacts/obs/globalprotect-openconnect-rpmlintrc ./artifacts/obs/globalpro
 sed -i"" -re "s/(Name:\s+).+/\1globalprotect-openconnect-snapshot/" \
     -re "s/(Conflicts:\s+).+/\1globalprotect-openconnect/" \
     ./artifacts/obs/globalprotect-openconnect-snapshot.spec
-
-# Update the AUR package
-cp ./packaging/aur/PKGBUILD-git ./artifacts/aur/PKGBUILD

scripts/snapshot-version.sh

@@ -1,3 +1,4 @@
 #!/bin/bash -e
 
-git describe --tags --match "v$(cat VERSION)" | sed -r -e 's/v([^-]+)-/+snapshot/' -e 's/-/./' > VERSION_SUFFIX
+VERSION="v$(cat VERSION)"
+git describe --tags --match "${VERSION}" | sed -re 's/^v([^-]+)-([^-]+)-(.+)/\1+\2snapshot.\3/' > VERSION