Commit f646c563 authored by Christophe Henry's avatar Christophe Henry

Merge branch 'diableble-assemble-non-develop' into 'develop'

Disable Assamble on other branches than develop

See merge request !84
parents 85b3fbaf 1e13ea5f
Pipeline #3726 passed with stage
in 0 seconds
...@@ -4,6 +4,7 @@ pipeline { ...@@ -4,6 +4,7 @@ pipeline {
image "bitriseio/docker-android" image "bitriseio/docker-android"
args "-v /etc/passwd:/etc/passwd:ro " + args "-v /etc/passwd:/etc/passwd:ro " +
"-v /home/android/android-sdk-linux/:/opt/android-sdk-linux/:rw " + "-v /home/android/android-sdk-linux/:/opt/android-sdk-linux/:rw " +
"-v /home/android/.gradle/:/root/.gradle/:rw " +
"-v /home/android/freshrss_signkey.jks:/home/android/freshrss_signkey.jks:ro " + "-v /home/android/freshrss_signkey.jks:/home/android/freshrss_signkey.jks:ro " +
"-u root --privileged" "-u root --privileged"
} }
...@@ -23,14 +24,7 @@ pipeline { ...@@ -23,14 +24,7 @@ pipeline {
buildDiscarder(logRotator(numToKeepStr: "2")) buildDiscarder(logRotator(numToKeepStr: "2"))
skipStagesAfterUnstable() skipStagesAfterUnstable()
gitLabConnection('GitlabFeneas') gitLabConnection('GitlabFeneas')
gitlabBuilds(builds: [ gitlabBuilds(builds: getBuildSteps(env.BRANCH_NAME))
"Compile",
"Lint",
"Unit tests",
"Instrumented tests on min SDK image",
"Instrumented tests on max SDK image",
"Build APK"
])
disableConcurrentBuilds() disableConcurrentBuilds()
newContainerPerStage() newContainerPerStage()
timestamps() timestamps()
...@@ -137,6 +131,8 @@ pipeline { ...@@ -137,6 +131,8 @@ pipeline {
archiveArtifacts artifacts: "**/*.apk", fingerprint: true archiveArtifacts artifacts: "**/*.apk", fingerprint: true
} }
} }
when { branch "develop" }
} }
} }
...@@ -145,4 +141,16 @@ pipeline { ...@@ -145,4 +141,16 @@ pipeline {
sh "chown jenkins: ${env.WORKSPACE}" sh "chown jenkins: ${env.WORKSPACE}"
} }
} }
}
def getBuildSteps(String branch) {
def buildSteps = [
"Compile",
"Lint",
"Unit tests",
"Instrumented tests on min SDK image",
"Instrumented tests on max SDK image"
]
if(branch == "develop") return buildSteps + ["Build APK"]
return buildSteps
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment