Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' into feature/88-x-frame-options

Browse source
This commit is contained in:
jc21 2019-03-04 09:55:26 +10:00 committed by GitHub
commit 77269b8a37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Jenkinsfile vendored
View file

@ -81,11 +81,11 @@ pipeline {
} }
} }
stage('Build Master') { stage('Build Master') {
parallel {
stage('x86_64') {
when { when {
branch 'master' branch 'master'
} }
parallel {
stage('x86_64') {
steps { steps {
ansiColor('xterm') { ansiColor('xterm') {
// Codebase // Codebase
@ -127,9 +127,6 @@ pipeline {
} }
} }
stage('armhf') { stage('armhf') {
when {
branch 'master'
}
agent { agent {
label 'armhf' label 'armhf'
} }
@ -173,9 +170,6 @@ pipeline {
} }
} }
stage('arm64') { stage('arm64') {
when {
branch 'master'
}
agent { agent {
label 'arm64' label 'arm64'
} }