Commit 17e1aceb authored by Angel Lopez's avatar Angel Lopez
Browse files

Merge branch 'main' into 'master'

Renamed the 'master' branch to 'main' branch

See merge request !3
parents 7aa737e2 fbfa997c
......@@ -52,7 +52,7 @@ spec:
sshagent(['git.eclipse.org-bot-ssh']) {
sh '''
git clone ssh://genie.${PROJECT_NAME}@git.eclipse.org:29418/www.eclipse.org/${PROJECT_NAME}.git .
if [ "${BRANCH_NAME}" = "master" ]; then
if [ "${BRANCH_NAME}" = "main" ]; then
git checkout master
else
git checkout ${BRANCH_NAME}
......@@ -62,9 +62,9 @@ spec:
}
}
}
stage('Build website (master) with Hugo') {
stage('Build website (main) with Hugo') {
when {
branch 'master'
branch 'main'
}
steps {
container('hugo') {
......@@ -89,7 +89,7 @@ spec:
stage('Push to $env.BRANCH_NAME branch') {
when {
anyOf {
branch "master"
branch "main"
branch "staging"
}
}
......@@ -105,7 +105,7 @@ spec:
git config user.name "${PROJECT_BOT_NAME}"
git commit -m "Website build ${JOB_NAME}-${BUILD_NUMBER}"
git log --graph --abbrev-commit --date=relative -n 5
if [ "${BRANCH_NAME}" = "master" ]; then
if [ "${BRANCH_NAME}" = "main" ]; then
git push origin HEAD:master
else
git push origin HEAD:${BRANCH_NAME}
......
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