Jenkins: Fix .git being lost across stash/unstash
This commit is contained in:
2
.ci/Jenkinsfile
vendored
2
.ci/Jenkinsfile
vendored
@@ -106,7 +106,7 @@ def gitClone(repository, branch) {
|
||||
println "[-] Using git commit [${env.GIT_COMMIT}]"
|
||||
|
||||
/* Stash data and mark it as stashed. */
|
||||
stash name: 'git'
|
||||
stash name: 'git', useDefaultExcludes: false
|
||||
env.GIT_STASHED = 'true'
|
||||
} else {
|
||||
/* Unstash data. */
|
||||
|
@@ -297,7 +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" -a "$CI" = "true" ] && 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)\""
|
||||
|
||||
|
Reference in New Issue
Block a user