all: sync rc fix with master
This commit is contained in:
parent
6f7bfd6c9c
commit
55fb914537
|
@ -40,6 +40,8 @@
|
||||||
'jobs':
|
'jobs':
|
||||||
- 'Publish to GitHub Releases'
|
- 'Publish to GitHub Releases'
|
||||||
|
|
||||||
|
# TODO(e.burkov): In jobs below find out why the explicit checkout is
|
||||||
|
# performed.
|
||||||
'Build frontend':
|
'Build frontend':
|
||||||
'docker':
|
'docker':
|
||||||
'image': '${bamboo.dockerGo}'
|
'image': '${bamboo.dockerGo}'
|
||||||
|
|
|
@ -68,9 +68,6 @@
|
||||||
|
|
||||||
set -e -f -u -x
|
set -e -f -u -x
|
||||||
|
|
||||||
# Explicitly checkout the revision that we need.
|
|
||||||
git checkout "${bamboo.repository.revision.number}"
|
|
||||||
|
|
||||||
make\
|
make\
|
||||||
ARCH="amd64"\
|
ARCH="amd64"\
|
||||||
OS="windows darwin linux"\
|
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 {
|
if disableUpdate {
|
||||||
log.Info("AdGuard Home updates are disabled")
|
log.Info("AdGuard Home updates are disabled")
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,9 +14,10 @@ import (
|
||||||
|
|
||||||
// Channel constants.
|
// Channel constants.
|
||||||
const (
|
const (
|
||||||
|
ChannelBeta = "beta"
|
||||||
|
ChannelCandidate = "candidate"
|
||||||
ChannelDevelopment = "development"
|
ChannelDevelopment = "development"
|
||||||
ChannelEdge = "edge"
|
ChannelEdge = "edge"
|
||||||
ChannelBeta = "beta"
|
|
||||||
ChannelRelease = "release"
|
ChannelRelease = "release"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue