mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request 2171: AG-28455 remove checkout
Squashed commit of the following: commit 3b90850dae360878925a82a48eeb360ecf6c6969 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 15:34:11 2024 +0300 version: sort version strings commit 7a9cb73a2f6c3579e104745b5c31abdd9edc8e33 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 13:02:36 2024 +0300 all: account candidate channel commit 76d237412f17ddfdd09def97f13489a4fc98d641 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 12 20:02:55 2024 +0300 bamboo-specs: add todo commit f99c726386a4a3ef322a32677a6c0a0e2dd6bbcc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 12 20:01:38 2024 +0300 bamboo-specs: revert release commit 70a3b3e93647ed9474e0679e6e2d91b4b06691d4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 12 19:58:20 2024 +0300 bamboo-specs: rm explicit checkout
This commit is contained in:
parent
14c6be3b1f
commit
3608a2def2
@ -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
Block a user