mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-21 20:45:33 +03:00
all: sync rc fix with master
This commit is contained in:
parent
6f7bfd6c9c
commit
55fb914537
4 changed files with 12 additions and 5 deletions
|
@ -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}'
|
||||
|
|
|
@ -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"\
|
||||
|
|
|
@ -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")
|
||||
}
|
||||
|
|
|
@ -14,9 +14,10 @@ import (
|
|||
|
||||
// Channel constants.
|
||||
const (
|
||||
ChannelBeta = "beta"
|
||||
ChannelCandidate = "candidate"
|
||||
ChannelDevelopment = "development"
|
||||
ChannelEdge = "edge"
|
||||
ChannelBeta = "beta"
|
||||
ChannelRelease = "release"
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue