Skip to content

Commit

Permalink
Properly define merge branches
Browse files Browse the repository at this point in the history
  • Loading branch information
skuzzle committed Jan 24, 2024
1 parent 2dc7d6b commit a1435bb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions JenkinsfileRelease
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
string(name: 'RELEASE_VERSION', defaultValue: '', description: 'Version to be released')
booleanParam(name: 'RELEASE_DRY_RUN', defaultValue: false, description: 'Whether to push releases to GitHub')
booleanParam(name: 'RELEASE_VERBOSE', defaultValue: false, description: 'Whether to print more verbose logs during release')
booleanParam(name: 'IS_PRODUCTION', defaultValue: false, description: 'If true, dev branch will be merged and push to main. Disable this for release candidates. No effect when dry run is true')
booleanParam(name: 'RELEASE_MERGE_BRANCHES', defaultValue: false, description: 'If true, dev branch will be merged and push to main. Disable this for release candidates. No effect when dry run is true')
}
stages {
stage ('Ensure dev branch') {
Expand Down Expand Up @@ -83,7 +83,7 @@ pipeline {
withGradle {
sh './gradlew prepareRelease'
sh './gradlew releaseGitLocal'
sh './gradlew pushRelease -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET -PreleaseMergeBranches=$IS_PRODUCTION'
sh './gradlew pushRelease -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET'
}
}
}
Expand Down

0 comments on commit a1435bb

Please sign in to comment.