80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Jenkins: Switch back to cleaning workspace before build

Browse Source
This commit is contained in:
RichardG867
2021-11-23 23:59:13 -03:00
parent 95f63cc05e
commit 1b60a825dc
1 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
.ci/Jenkinsfile vendored
View File

@@ -83,6 +83,9 @@ def gitClone() {
env.GIT_COMMIT = 'master' env.GIT_COMMIT = 'master'
println "[-] Using git tag [${env.GIT_COMMIT}]" println "[-] Using git tag [${env.GIT_COMMIT}]"
/* Clean workspace. */
cleanWs()
/* Use stashes to avoid performing multiple clones. */ /* Use stashes to avoid performing multiple clones. */
if (env.GIT_STASHED != 'true') { if (env.GIT_STASHED != 'true') {
/* Perform clone/checkout. */ /* Perform clone/checkout. */
@@ -168,9 +171,6 @@ pipeline {
try { try {
gitClone() gitClone()
} catch (e) {} } catch (e) {}
try {
cleanWs()
} catch (e) {}
} }
} }
} }
@@ -182,19 +182,13 @@ pipeline {
gitClone() gitClone()
/* Switch to temp directory. */ /* Switch to temp directory. */
dir(WORKSPACE_TMP) { dir("${env.WORKSPACE_TMP}/output") {
/* Clean output directory of potential stale old builds. */ /* Run source tarball creation process. */
removeDir('output') def packageName = "${env.JOB_BASE_NAME}-Source-b${env.BUILD_NUMBER}"
runBuild("-s \"$packageName\"")
/* Switch to output directory. */ /* Archive resulting artifacts. */
dir('output') { archiveArtifacts artifacts: "$packageName*"
/* Run source tarball creation process. */
def packageName = "${env.JOB_BASE_NAME}-Source-b${env.BUILD_NUMBER}"
runBuild("-s \"$packageName\"")
/* Archive resulting artifacts. */
archiveArtifacts artifacts: "$packageName*"
}
} }
} catch (e) { } catch (e) {
/* Mark that a failure occurred. */ /* Mark that a failure occurred. */
@@ -221,22 +215,16 @@ pipeline {
/* Run git clone. */ /* Run git clone. */
gitClone() gitClone()
/* Switch to temp directory. */ /* Switch to output directory. */
dir(WORKSPACE_TMP) { dir("${env.WORKSPACE_TMP}/output") {
/* Clean output directory of potential stale old builds. */ /* Run build process. */
removeDir('output') def packageName = "${env.JOB_BASE_NAME}${dynarecSlugs[dynarec]}${presetSlugs[preset]}-$os-$arch-b${env.BUILD_NUMBER}"
dir("${dynarecNames[dynarec]}/$os - ${archNames[arch]}") {
/* Switch to output directory. */ runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} -D \"BUILD_TYPE=$BUILD_TYPE\" -D \"EMU_BUILD=build ${env.BUILD_NUMBER}\" -D \"EMU_BUILD_NUM=${env.BUILD_NUMBER}\"")
dir('output') {
/* Run build process. */
def packageName = "${env.JOB_BASE_NAME}${dynarecSlugs[dynarec]}${presetSlugs[preset]}-$os-$arch-b${env.BUILD_NUMBER}"
dir("${dynarecNames[dynarec]}/$os - ${archNames[arch]}") {
runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} -D \"BUILD_TYPE=$BUILD_TYPE\" -D \"EMU_BUILD=build ${env.BUILD_NUMBER}\" -D \"EMU_BUILD_NUM=${env.BUILD_NUMBER}\"")
}
/* Archive resulting artifacts. */
archiveArtifacts artifacts: "**/**/$packageName*"
} }
/* Archive resulting artifacts. */
archiveArtifacts artifacts: "**/**/$packageName*"
} }
} catch (e) { } catch (e) {
/* Mark that a failure occurred. */ /* Mark that a failure occurred. */