From 0a9568612079a2b99e91362358d27f127de22361 Mon Sep 17 00:00:00 2001 From: Tom Hiller Date: Fri, 6 Jul 2018 00:45:55 -0400 Subject: [PATCH] fix(common): change dir before pulling latest from git --- common/download_coreboot.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common/download_coreboot.sh b/common/download_coreboot.sh index e48d371..7e06c45 100755 --- a/common/download_coreboot.sh +++ b/common/download_coreboot.sh @@ -36,6 +36,7 @@ function gitUpdate() { ## ################################################################################ function checkoutTag() { + cd "$DOCKER_COREBOOT_DIR" || exit git checkout tags/"$COREBOOT_TAG" || exit git submodule update --recursive --remote } @@ -47,8 +48,14 @@ function checkoutTag() { ## ################################################################################ function checkoutCommit() { -#edge should checkout master + cd "$DOCKER_COREBOOT_DIR" || exit + # bleeding-edge should checkout master git checkout "$COREBOOT_COMMIT" || exit + + if [ "$COREBOOT_COMMIT" == "master" ]; then + git pull --all + fi + git submodule update --recursive --remote } ################################################################################