diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 53504ef50..492f19875 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -96,7 +96,7 @@ def gitClone(repository, branch) { if (env.GIT_COMMIT == null) { /* Save the current HEAD commit. */ env.GIT_COMMIT = scmVars.GIT_COMMIT - } else { + } else if (env.GIT_COMMIT != scmVars.GIT_COMMIT) { /* Checkout the commit read from the polling log. */ if (isUnix()) sh "git checkout ${env.GIT_COMMIT} || exit 0" diff --git a/.ci/build.sh b/.ci/build.sh index 690565a56..1fde37f68 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -297,6 +297,7 @@ esac # Add git hash and copyright year. git_hash=$(git rev-parse --short HEAD 2> /dev/null) +[ -z "$git_hash" ] && git_hash=$(echo $GIT_COMMIT | cut -c 1-8) [ ! -z "$git_hash" ] && cmake_flags_extra="$cmake_flags_extra -D \"EMU_GIT_HASH=$git_hash\"" cmake_flags_extra="$cmake_flags_extra -D \"EMU_COPYRIGHT_YEAR=$(date +%Y)\""