feat(release): allow releasing from unstable branch to unstable repos

This is done in order to properly support the build workflow for gnome-unstable.
If one tries to release from branch "unstable" to a regular repo an error is emitted.

Co-authored-by: Christian Heusel <christian@heusel.eu>

src/archrelease.in

@@ -7,6 +7,8 @@ _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
 # shellcheck source=src/lib/valid-tags.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
+# shellcheck source=src/lib/util/git.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
 
 set -e
 
@@ -55,8 +57,8 @@ gittag=$(get_tag_from_pkgver "$pkgver")
 if ! branchname=$(git symbolic-ref --short HEAD); then
 	die 'not on any branch'
 fi
-if [[ "${branchname}" != main ]]; then
+if ! is_valid_release_branch "${branchname}"; then
-	die 'must be run from the main branch'
+	die 'must be run from a valid release branch (%s)' "${VALID_RELEASE_BRANCHES[@]}"
 fi
 
 # Check if remote origin is setup properly
@@ -85,10 +87,10 @@ if git tag --verify "$gittag" &> /dev/null; then
 	if [[ "$cwd_checksum" != "$tag_checksum" ]]; then
 		die "tagged PKGBUILD is not the same as the working dir PKGBUILD"
 	fi
-	git push --tags --set-upstream origin main || abort
+	git push --tags --set-upstream origin "${branchname}" || abort
 	exit 0
 fi
 
 msg "Releasing package"
 git tag --sign --message="Package release ${pkgver}" "$gittag" || abort
-git push --tags --set-upstream origin main || abort
+git push --tags --set-upstream origin "${branchname}" || abort

src/commitpkg.in

@@ -5,6 +5,8 @@
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+# shellcheck source=src/lib/util/git.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
 
 source /usr/share/makepkg/util/util.sh
 
@@ -70,8 +72,12 @@ if ! repo_spec=$(git config --local devtools.version) || [[ ${repo_spec} != "${G
 	exit 1
 fi
 
-if [[ "$(git symbolic-ref --short HEAD)" != main ]]; then
+if ! branchname=$(git symbolic-ref --short HEAD); then
-	die 'must be run from the main branch'
+	die 'not on any branch'
+fi
+
+if ! is_valid_release_branch "${branchname}"; then
+	die 'must be run from a valid release branch (%s)' "${VALID_RELEASE_BRANCHES[@]}"
 fi
 
 source=()
@@ -95,6 +101,9 @@ case "$cmd" in
 		;;
 esac
 
+if [[ "${branchname}" == "unstable" ]] && [[ "$repo" != *"unstable" ]]; then
+	die 'Cannot release from unstable branch into non-unstable repo: %s' "${repo}"
+fi
 
 if (( ${#validpgpkeys[@]} != 0 )); then
 	if [[ -d keys ]]; then

src/lib/common.sh

@@ -29,6 +29,8 @@ export GIT_PACKAGING_URL_SSH="git@${GITLAB_HOST}:${GIT_PACKAGING_NAMESPACE}"
 export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
 export PACKAGING_REPO_RELEASE_HOST=repos.archlinux.org
 
+export VALID_RELEASE_BRANCHES=(main unstable)
+
 # check if messages are to be printed using color
 if [[ -t 2 && "$TERM" != dumb ]] || [[ ${DEVTOOLS_COLOR} == always ]]; then
 	colorize

src/lib/util/git.sh

@@ -22,3 +22,8 @@ git_diff_tree() {
 		"${commit}" \
 		-- "${path}"
 }
+
+is_valid_release_branch() {
+	local branch=$1
+	in_array "${branch}" "${VALID_RELEASE_BRANCHES[@]}"
+}