From 2722abce9c964cc1a800af51ab5cd54510db12ab Mon Sep 17 00:00:00 2001
From: Kamil Piechaczek <pomek@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:38:18 +0200
Subject: [PATCH] Revert "Merge pull request #1013 from ckeditor/ci/3774"

This reverts commit 1cc2de522b9771463d32f9453f18814f87fbca24, reversing
changes made to ac408059b8c4b9673e304f88ec288cfd87a29760.
---
 .circleci/template.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.circleci/template.yml b/.circleci/template.yml
index 2baccf359..5b153d1b6 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -241,8 +235,7 @@ workflows:
           filters:
             branches:
               only:
-                # - master
-                - epic/3757-esm
+                - master
       - notify_ci_failure:
           filters:
             branches: