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

Jenkins: Read polling log to better avoid "no changes"

Browse Source
This commit is contained in:
RichardG867
2021-11-19 15:14:41 -03:00
parent 73281006b1
commit d97e63cca2
1 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
.ci/Jenkinsfile vendored
View File

@@ -78,13 +78,26 @@ def presetFlags = [
def anyFailure = false def anyFailure = false
def gitClone() { def gitClone() {
/* Read git tag from environment or set the default one. */
if (env.GIT_COMMIT == null) if (env.GIT_COMMIT == null)
env.GIT_COMMIT = 'master' env.GIT_COMMIT = 'master'
println "[-] Using git tag [${env.GIT_COMMIT}]" println "[-] Using git tag [${env.GIT_COMMIT}]"
def scmVars = checkout scm: [$class: 'GitSCM',
branches: [[name: env.GIT_COMMIT]], /* Use stashes to avoid performing multiple clones. */
userRemoteConfigs: [[url: 'https://github.com/86Box/86Box.git']]] if (env.GIT_STASHED != 'true') {
env.GIT_COMMIT = scmVars.GIT_COMMIT /* Perform clone/checkout. */
def scmVars = checkout scm: [$class: 'GitSCM',
branches: [[name: env.GIT_COMMIT]],
userRemoteConfigs: [[url: 'https://github.com/86Box/86Box.git']]]
env.GIT_COMMIT = scmVars.GIT_COMMIT
/* Stash data and mark it as stashed. */
stash name: 'git'
env.GIT_STASHED = 'true'
} else {
/* Unstash data. */
unstash name: 'git'
}
} }
def removeDir(dir) { def removeDir(dir) {
@@ -98,31 +111,37 @@ def runBuild(args) {
if (isUnix()) if (isUnix())
sh "chmod u+x \"$WORKSPACE/.ci/build.sh\" && exec \"$WORKSPACE/.ci/build.sh\" $args" sh "chmod u+x \"$WORKSPACE/.ci/build.sh\" && exec \"$WORKSPACE/.ci/build.sh\" $args"
else else
bat "C:\\msys64\\msys2_shell.cmd -msys2 -defterm -here -no-start -c 'exec \"\$(cygpath -u \\'%WORKSPACE%\\')\"/.ci/build.sh $args'" bat "C:\\msys64\\msys2_shell.cmd -msys2 -defterm -here -no-start -c 'exec \"\$(cygpath -u \\'%WORKSPACE%\\')/.ci/build.sh\" $args'"
} }
pipeline { pipeline {
agent none agent none
environment {
DISCORD_WEBHOOK_URL = credentials('discord-webhook-url')
}
options {
disableConcurrentBuilds()
quietPeriod(0)
}
parameters { parameters {
string(name: 'BUILD_TYPE', string(name: 'BUILD_TYPE',
defaultValue: 'beta', /* !!! CHANGE HERE !!! for build type */ defaultValue: 'beta', /* !!! CHANGE HERE !!! for build type */
description: "Build type to pass on to CMake. Don't change this, you should instead change the default value on .ci/Jenkinsfile") description: "Build type to pass on to CMake. Don't change this, you should instead change the default value on .ci/Jenkinsfile")
} }
environment {
DISCORD_WEBHOOK_URL = credentials('discord-webhook-url')
}
stages { stages {
stage('Source Tarball') { stage('Source Tarball') {
agent none agent none
steps { steps {
script { script {
/* Cursed hack to extract the current HEAD commit from this build's /* Hack to extract the current HEAD commit from this build's git polling
git polling log. This avoids a timing issue where HEAD changes log. This avoids a race condition where HEAD changes in the time period
between polling and the nodes being available below. */ between Jenkins polling the git repository and the first build node
performing the first git clone once ready. (See issue JENKINS-20518) */
if (env.GIT_COMMIT == null) { if (env.GIT_COMMIT == null) {
/* This must run on the master node to read the polling log. */ /* This must run on the master node to read the polling log. */
node('master') { node('master') {
@@ -141,7 +160,8 @@ pipeline {
} catch (e) {} } catch (e) {}
} }
/* If the polling log parsing fails, run a dummy git clone on any node. */ /* If the polling log parsing fails, perform a dummy git clone on any node.
Not quite as fast as reading the polling log, but it works as a backup. */
if (env.GIT_COMMIT == null) { if (env.GIT_COMMIT == null) {
node { node {
/* Ignore exceptions again as this is not really critical. */ /* Ignore exceptions again as this is not really critical. */
@@ -207,10 +227,12 @@ pipeline {
removeDir('output') removeDir('output')
/* Switch to output directory. */ /* Switch to output directory. */
dir("output/${dynarecNames[dynarec]}/$os - ${archNames[arch]}") { dir('output') {
/* Run build process. */ /* Run build process. */
def packageName = "${env.JOB_BASE_NAME}${dynarecSlugs[dynarec]}${presetSlugs[preset]}-$os-$arch-b${env.BUILD_NUMBER}" def packageName = "${env.JOB_BASE_NAME}${dynarecSlugs[dynarec]}${presetSlugs[preset]}-$os-$arch-b${env.BUILD_NUMBER}"
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("${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. */ /* Archive resulting artifacts. */
archiveArtifacts artifacts: "**/**/$packageName*" archiveArtifacts artifacts: "**/**/$packageName*"