From af1986828bea2ee9521716142931a8f4cf0c4581 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Thu, 15 Dec 2022 17:14:55 +0100 Subject: [PATCH] Switch branch to main --- lib/update-bridgehead.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index 3201fc5..cddfa5d 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -79,6 +79,15 @@ for DIR in /etc/bridgehead $(pwd); do fi done +if [ "$(git -C /srv/docker/bridgehead rev-parse --abbrev-ref HEAD)" == "feature/samplyBeam" ]; then + A="You are on branch feature/samplyBeam -- switching to main" + log "WARN" "$A" + report_error 70 "$A" + git -C /srv/docker/bridgehead fetch origin main:main + git -C /srv/docker/bridgehead checkout main + git_updated="true" +fi + # Check docker updates log "INFO" "Checking for updates to running docker images ..." docker_updated="false"