mirror of
https://github.com/jc21/nginx-proxy-manager.git
synced 2024-08-30 18:22:48 +00:00
CI: Prevent having to spin up resources when not Master branch
This commit is contained in:
parent
ae9324295c
commit
aad9ecde6b
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -82,11 +82,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
stage('Build Master') {
|
stage('Build Master') {
|
||||||
when {
|
when {
|
||||||
<<<<<<< HEAD
|
|
||||||
branch 'master'
|
branch 'master'
|
||||||
=======
|
|
||||||
branch: 'master'
|
|
||||||
>>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
|
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
stage('x86_64') {
|
stage('x86_64') {
|
||||||
|
Loading…
Reference in New Issue
Block a user