Files
@ r22893:90448b6694c1
Branch filter:
Location: cpp/openttd-patchpack/source/Jenkinsfile - annotation
r22893:90448b6694c1
2.3 KiB
text/plain
Fix #6659: Bus stations can be demolished when not in demolish mode (#6815)
For Bus and Road stations only, if you are in demolish mode and click on the station
without releasing the button. Then you cancel demolish mode with R key.
Finally you release the mouse button. The station was demolished, instead of being built.
The demolish mode was not checked when mouse up event occured.
For Bus and Road stations only, if you are in demolish mode and click on the station
without releasing the button. Then you cancel demolish mode with R key.
Finally you release the mouse button. The station was demolished, instead of being built.
The demolish mode was not checked when mouse up event occured.
r22799:4e754fa9c0c8 r22799:4e754fa9c0c8 r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22822:d556b84bf7cb r22822:d556b84bf7cb r22822:d556b84bf7cb r22773:d894de0b35da r22773:d894de0b35da r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22771:1d76547d631d r22771:1d76547d631d r22771:1d76547d631d r22771:1d76547d631d r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22773:d894de0b35da r22823:2a1d6ae768ae r22801:c7c901324dec r22824:1c6c149482bf r22798:627ddc78c732 r22771:1d76547d631d r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22798:627ddc78c732 r22771:1d76547d631d r22771:1d76547d631d r22771:1d76547d631d r22771:1d76547d631d r22771:1d76547d631d r22800:503fb7649d50 r22800:503fb7649d50 r22800:503fb7649d50 r22773:d894de0b35da r22810:a489853b0c8e r22810:a489853b0c8e r22810:a489853b0c8e r22810:a489853b0c8e r22800:503fb7649d50 r22800:503fb7649d50 r22773:d894de0b35da r22804:914afe3acd91 r22804:914afe3acd91 r22804:914afe3acd91 r22800:503fb7649d50 r22800:503fb7649d50 r22771:1d76547d631d r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22801:c7c901324dec r22800:503fb7649d50 r22771:1d76547d631d r22771:1d76547d631d r22771:1d76547d631d | #!/usr/bin/env groovy
// The stages we run one by one
// Please don't add more than 2 items in a single stage; this hurts performance
def ci_stages = [
"Checkers": [
"commit-checker": "openttd/compile-farm-ci:commit-checker",
],
"Compilers": [
"linux-amd64-gcc-6": "openttd/compile-farm-ci:linux-amd64-gcc-6",
"linux-amd64-clang-3.8": "openttd/compile-farm-ci:linux-amd64-clang-3.8",
],
"Archs": [
"linux-i386-gcc-6": "openttd/compile-farm-ci:linux-i386-gcc-6",
],
"OS": [
"osx-10.9": "openttd/compile-farm-ci:osx-10.9",
],
]
def generateStage(targets) {
return targets.collectEntries{ key, target ->
["${key}": generateCI(key, target)]
}
}
def generateCI(display_name, image_name) {
return {
githubNotify context: 'openttd/' + display_name, description: 'This commit is being built', status: 'PENDING'
try {
dir("${display_name}") {
unstash "source"
docker.image("${image_name}").pull()
docker.image("${image_name}").withRun("--volumes-from ${hostname} --workdir " + pwd()) { c ->
sh "docker logs --follow ${c.id}; exit `docker wait ${c.id}`"
}
}
githubNotify context: 'openttd/' + display_name, description: 'The commit looks good', status: 'SUCCESS'
}
catch (error) {
githubNotify context: 'openttd/' + display_name, description: 'The commit cannot be built', status: 'FAILURE'
throw error
}
}
}
node {
ansiColor('xterm') {
stage("Checkout") {
checkout scm
// Ensure user.email and user.name is set, otherwise rebase cannot work
sh "git config user.email 'info@openttd.org'"
sh "git config user.name 'OpenTTD CI'"
// Ensure we also have origin/master available
sh "git fetch --no-tags origin master:refs/remotes/origin/master"
// Try to rebase to origin/master; if this fails, fail the CI
sh "git rebase origin/master"
stash name: "source", useDefaultExcludes: false
}
ci_stages.each { ci_stage ->
stage(ci_stage.key) {
parallel generateStage(ci_stage.value)
}
}
}
}
|