all: sync rc fix with master

AdguardTeam · Mar 13, 2024 · 55fb914 · 55fb914
1 parent 6f7bfd6
commit 55fb914
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
@@ -40,6 +40,8 @@
         'jobs':
           - 'Publish to GitHub Releases'
 
+# TODO(e.burkov):  In jobs below find out why the explicit checkout is
+# performed.
 'Build frontend':
     'docker':
         'image': '${bamboo.dockerGo}'

diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
@@ -68,9 +68,6 @@
 
                 set -e -f -u -x
 
-                # Explicitly checkout the revision that we need.
-                git checkout "${bamboo.repository.revision.number}"
-
                 make\
                         ARCH="amd64"\
                         OS="windows darwin linux"\

diff --git a/internal/home/home.go b/internal/home/home.go
@@ -494,7 +494,14 @@ func initWeb(opts options, clientBuildFS fs.FS, upd *updater.Updater) (web *webA
 		}
 	}
 
-	disableUpdate := opts.disableUpdate || version.Channel() == version.ChannelDevelopment
+	disableUpdate := opts.disableUpdate
+	switch version.Channel() {
+	case
+		version.ChannelDevelopment,
+		version.ChannelCandidate:
+		disableUpdate = true
+	}
+
 	if disableUpdate {
 		log.Info("AdGuard Home updates are disabled")
 	}

diff --git a/internal/version/version.go b/internal/version/version.go
@@ -14,9 +14,10 @@ import (
 
 // Channel constants.
 const (
+	ChannelBeta        = "beta"
+	ChannelCandidate   = "candidate"
 	ChannelDevelopment = "development"
 	ChannelEdge        = "edge"
-	ChannelBeta        = "beta"
 	ChannelRelease     = "release"
 )