Skip to content

Commit

Permalink
Changed master to main in Jenkinsfile (#61)
Browse files Browse the repository at this point in the history
* Changed master to main in Jenkinsfile
  • Loading branch information
rasilvap authored Jan 11, 2022
1 parent e8c04ee commit 2b86c3a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ node('ubuntu-chef-zion') {

defaultsFileLocation = "${pwd()}/attributes/default.rb"

branch = checkoutDetails.GIT_BRANCH == 'origin/master' ? 'master' : checkoutDetails.GIT_BRANCH
branch = checkoutDetails.GIT_BRANCH == 'origin/main' ? 'main' : checkoutDetails.GIT_BRANCH
commitId = checkoutDetails.GIT_COMMIT

version = getVersion()
Expand Down Expand Up @@ -139,7 +139,7 @@ node('ubuntu-chef-zion') {
archiveArtifacts artifacts: "${archiveName}", onlyIfSuccessful: true
}
}
if (branch != 'master') {
if (branch != 'main') {
return
}
input 'Push tags?'
Expand Down Expand Up @@ -172,7 +172,7 @@ node('ubuntu-chef-zion') {
""")
}
} finally {
OsTools.runSafe(this, 'git clean -f && git reset --hard origin/master')
OsTools.runSafe(this, 'git clean -f && git reset --hard origin/main')
}
}
def getGemInstallDirectory() {
Expand Down

0 comments on commit 2b86c3a

Please sign in to comment.