From 3608a2def235d2f6b57c4a0520a1e21dc6895bd9 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Wed, 13 Mar 2024 15:51:22 +0300 Subject: [PATCH] Pull request 2171: AG-28455 remove checkout Squashed commit of the following: commit 3b90850dae360878925a82a48eeb360ecf6c6969 Author: Eugene Burkov Date: Wed Mar 13 15:34:11 2024 +0300 version: sort version strings commit 7a9cb73a2f6c3579e104745b5c31abdd9edc8e33 Author: Eugene Burkov Date: Wed Mar 13 13:02:36 2024 +0300 all: account candidate channel commit 76d237412f17ddfdd09def97f13489a4fc98d641 Author: Eugene Burkov Date: Tue Mar 12 20:02:55 2024 +0300 bamboo-specs: add todo commit f99c726386a4a3ef322a32677a6c0a0e2dd6bbcc Author: Eugene Burkov Date: Tue Mar 12 20:01:38 2024 +0300 bamboo-specs: revert release commit 70a3b3e93647ed9474e0679e6e2d91b4b06691d4 Author: Eugene Burkov Date: Tue Mar 12 19:58:20 2024 +0300 bamboo-specs: rm explicit checkout --- bamboo-specs/release.yaml | 2 ++ bamboo-specs/test.yaml | 3 --- internal/home/home.go | 9 ++++++++- internal/version/version.go | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index 26d39c8f..b6ba76ed 100644 --- 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 index 2d8b1a10..c65c8052 100644 --- 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 index 4cc91716..47ed6b2d 100644 --- 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 index e14e08dd..7ca7555e 100644 --- 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" )