Skip to content

Commit

Permalink
Update CI branches
Browse files Browse the repository at this point in the history
  • Loading branch information
Mati365 committed Aug 13, 2024
1 parent b42d59a commit 047ca86
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ commands:
CKE5_GITHUB_ORGANIZATION="ckeditor"
CKE5_GITHUB_REPOSITORY="ckeditor5-integrations-common"
CKE5_CIRCLE_APPROVAL_JOB_NAME="release_approval"
CKE5_GITHUB_RELEASE_BRANCH="master"
CKE5_GITHUB_RELEASE_BRANCH="main"
echo export CKE5_CIRCLE_APPROVAL_JOB_NAME=$CKE5_CIRCLE_APPROVAL_JOB_NAME >> $BASH_ENV
echo export CKE5_GITHUB_RELEASE_BRANCH=$CKE5_GITHUB_RELEASE_BRANCH >> $BASH_ENV
Expand Down Expand Up @@ -192,11 +192,11 @@ jobs:
command: |
#!/bin/bash
CKE5_LATEST_COMMIT_HASH=$( git log -n 1 --pretty=format:%H origin/master )
CKE5_LATEST_COMMIT_HASH=$( git log -n 1 --pretty=format:%H origin/main )
CKE5_TRIGGER_COMMIT_HASH=<< pipeline.parameters.triggerCommitHash >>
if [[ "${CKE5_LATEST_COMMIT_HASH}" != "${CKE5_TRIGGER_COMMIT_HASH}" ]]; then
echo "There is a newer commit in the repository on the \`#master\` branch. Use its build to start the release."
echo "There is a newer commit in the repository on the \`#main\` branch. Use its build to start the release."
circleci-agent step halt
fi
- npm_login_command
Expand Down Expand Up @@ -256,12 +256,12 @@ workflows:
filters:
branches:
only:
- master
- main
- notify_ci_failure:
filters:
branches:
only:
- master
- main

release:
when:
Expand All @@ -287,4 +287,4 @@ workflows:
filters:
branches:
only:
- master
- main

0 comments on commit 047ca86

Please sign in to comment.