Pull request 2150: AG-28455 rc versions

Squashed commit of the following:

commit 9b80bf2
Merge: 2c18415 fede297
Author: Eugene Burkov <[email protected]>
Date:   Fri Feb 16 15:49:23 2024 +0300

    Merge branch 'master' into AG-28455-rc-versions

commit 2c18415
Author: Eugene Burkov <[email protected]>
Date:   Wed Feb 14 13:01:30 2024 +0300

    scripts: imp code

commit f096505
Author: Eugene Burkov <[email protected]>
Date:   Tue Feb 13 14:52:10 2024 +0300

    scripts: imp code

commit a5bed23
Author: Eugene Burkov <[email protected]>
Date:   Mon Feb 12 18:35:52 2024 +0300

    scripts: fix typo

commit 36e9ea1
Author: Eugene Burkov <[email protected]>
Date:   Mon Feb 12 15:41:57 2024 +0300

    scripts: revert changes, imp docs

commit d74c85d
Author: Eugene Burkov <[email protected]>
Date:   Mon Feb 5 18:12:38 2024 +0300

    all: mark rc versions separately

bamboo-specs/test.yaml

@@ -6,6 +6,7 @@
     'name': 'AdGuard Home - Build and run tests'
 'variables':
     'dockerGo': 'adguard/golang-ubuntu:8.0'
+    'channel': 'development'
 
 'stages':
   - 'Tests':
@@ -73,7 +74,7 @@
                 make\
                         ARCH="amd64"\
                         OS="windows darwin linux"\
-                        CHANNEL="development"\
+                        CHANNEL=${bamboo.channel}\
                         SIGN=0\
                         PARALLELISM=1\
                         VERBOSE=2\
@@ -115,3 +116,16 @@
 'labels': []
 'other':
     'concurrent-build-plugin': 'system-default'
+
+'branch-overrides':
+    # rc-vX.Y.Z branches are the release candidate branches. They are created
+    # from the release branch and are used to build the release candidate
+    # images.
+  - '^rc-v[0-9]+\.[0-9]+\.[0-9]+':
+        # Build betas on release branches manually.
+        'triggers': []
+        # Set the default release channel on the release branch to beta, as we
+        # may need to build a few of these.
+        'variables':
+            'dockerGo': 'adguard/golang-ubuntu:8.0'
+            'channel': 'candidate'

scripts/make/go-build.sh

@@ -51,12 +51,12 @@ readonly channel
 
 case "$channel"
 in
-('development'|'edge'|'beta'|'release')
+('development'|'edge'|'beta'|'release'|'candidate')
 	# All is well, go on.
 	;;
 (*)
 	echo "invalid channel '$channel', supported values are\
-		'development', 'edge', 'beta', and 'release'" 1>&2
+		'development', 'edge', 'beta', 'release', and 'candidate'" 1>&2
 	exit 1
 	;;
 esac

scripts/make/version.sh

@@ -43,7 +43,7 @@ bump_minor='/^v[0-9]+\.[0-9]+\.0$/ {
 }
 
 {
-	printf("invalid release version: \"%s\"\n", $0);
+	printf("invalid minor release version: \"%s\"\n", $0);
 
 	exit 1;
 }'
@@ -128,15 +128,40 @@ in
 
 	version="$last_tag"
 	;;
+('candidate')
+	# This pseudo-channel is used to set a proper versions into release
+	# candidate builds.
+
+	# last_tag is expected to be the latest release tag.
+	last_tag="$( git describe --abbrev=0 )"
+	readonly last_tag
+
+	# current_branch is the name of the branch currently checked out.
+	current_branch="$( git rev-parse --abbrev-ref HEAD )"
+	readonly current_branch
+
+	# The branch should be named like:
+	#
+	#   rc-v12.34.56
+	#
+	if ! echo "$current_branch" | grep -E -e '^rc-v[0-9]+\.[0-9]+\.[0-9]+$' -q
+	then
+		echo "invalid release candidate branch name '$current_branch'" 1>&2
+
+		exit 1
+	fi
+
+	version="${current_branch#rc-}-rc.$( git rev-list --count "$last_tag"..HEAD )"
+	;;
 (*)
 	echo "invalid channel '$channel', supported values are\
-		'development', 'edge', 'beta', and 'release'" 1>&2
+		'development', 'edge', 'beta', 'release' and 'candidate'" 1>&2
 	exit 1
 	;;
 esac
 
 # Finally, make sure that we don't output invalid versions.
-if ! echo "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+(-(a|b|dev)\.[0-9]+)?(\+[[:xdigit:]]+)?$' -q
+if ! echo "$version" | grep -E -e '^v[0-9]+\.[0-9]+\.[0-9]+(-(a|b|dev|rc)\.[0-9]+)?(\+[[:xdigit:]]+)?$' -q
 then
 	echo "generated an invalid version '$version'" 1>&2