Skip to content

Commit

Permalink
Revert "Merge pull request #1013 from ckeditor/ci/3774"
Browse files Browse the repository at this point in the history
This reverts commit 1cc2de5, reversing
changes made to ac40805.
  • Loading branch information
pomek committed Oct 1, 2024
1 parent 6127e07 commit 2722abc
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions .circleci/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ commands:
CKE5_GITHUB_ORGANIZATION="ckeditor"
CKE5_GITHUB_REPOSITORY="ckeditor5-dev"
CKE5_CIRCLE_APPROVAL_JOB_NAME="release_approval"
# CKE5_GITHUB_RELEASE_BRANCH="master"
CKE5_GITHUB_RELEASE_BRANCH="epic/3757-esm"
CKE5_GITHUB_RELEASE_BRANCH="master"
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 @@ -134,8 +133,7 @@ jobs:
- bootstrap_repository_command
- run:
name: Check if packages are ready to be released
# command: yarn run release:prepare-packages --verbose --compile-only
command: yarn run release:prepare-packages --verbose --compile-only --branch=epic/3757-esm
command: yarn run release:prepare-packages --verbose --compile-only

trigger_release_process:
machine: true
Expand Down Expand Up @@ -173,13 +171,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/epic/3757-esm )
CKE5_LATEST_COMMIT_HASH=$( git log -n 1 --pretty=format:%H origin/master )
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 \`#epic/3757-esm\` branch. Use its build to start the release."
echo "There is a newer commit in the repository on the \`#master\` branch. Use its build to start the release."
circleci-agent step halt
fi
- npm_login_command
Expand All @@ -205,12 +201,10 @@ jobs:
command: yarn ckeditor5-dev-ci-circle-disable-auto-cancel-builds
- run:
name: Prepare the new version to release
# command: npm run release:prepare-packages -- --verbose
command: npm run release:prepare-packages -- --verbose --branch=epic/3757-esm
command: npm run release:prepare-packages -- --verbose
- run:
name: Publish the packages
# command: npm run release:publish-packages -- --verbose
command: npm run release:publish-packages -- --verbose --branch=epic/3757-esm
command: npm run release:publish-packages -- --verbose
- run:
name: Enable the redundant workflows option
command: yarn ckeditor5-dev-ci-circle-enable-auto-cancel-builds
Expand Down Expand Up @@ -241,8 +235,7 @@ workflows:
filters:
branches:
only:
# - master
- epic/3757-esm
- master
- notify_ci_failure:
filters:
branches:
Expand Down

0 comments on commit 2722abc

Please sign in to comment.