From cf24044bb6f756aa688c19d07b0d4b0e7d9511e9 Mon Sep 17 00:00:00 2001 From: pvogt09 <50047961+pvogt09@users.noreply.github.com> Date: Sun, 27 Dec 2020 18:56:33 +0100 Subject: [PATCH] no git pull in Github Action runs for pull requests Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com> --- automated install/basic-install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 797c0c76..9133af23 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -473,7 +473,10 @@ update_repo() { git stash --all --quiet &> /dev/null || true # Okay for stash failure git clean --quiet --force -d || true # Okay for already clean directory # Pull the latest commits - git pull --quiet &> /dev/null || return $? + if ! git branch | grep --quiet -E '^[*] [(]HEAD detached at pull/[[:digit:]]+/merge[)]$'; then + # if tests are run with Github Actions, pulling changes will not be possible because of 'detached HEAD' state + git pull --quiet &> /dev/null || return $? + fi # Check current branch. If it is master, then reset to the latest available tag. # In case extra commits have been added after tagging/release (i.e in case of metadata updates/README.MD tweaks) curBranch=$(git rev-parse --abbrev-ref HEAD)