From c93a08e0bb56afbc7ef32b4c3a4eb1c275373889 Mon Sep 17 00:00:00 2001 From: Daniel Silhavy Date: Mon, 11 Mar 2024 15:18:38 +0100 Subject: [PATCH] Fix CircleCI config, move away from v5.0.0 branch (#4412) --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2717b09c0e..4fd799b7a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -130,11 +130,11 @@ jobs: steps: - checkout - run: - name: Merge into v5.0.0 virtually + name: Merge into development virtually command: | git config --global user.email "circleci@example.com" git config --global user.name "CircleCI" - git checkout v5.0.0 + git checkout development git merge --no-edit --no-ff $CIRCLE_BRANCH - dependencies_setup - build_unit_test_steps @@ -145,14 +145,14 @@ jobs: - functional_precondition - checkout - run: - name: Virtual merge into v5.0.0 branch + name: Virtual merge into development branch command: | - if [ "${CIRCLE_BRANCH}" = "v5.0.0" ]; then - echo "On v5.0.0 branch already, no merge needed" + if [ "${CIRCLE_BRANCH}" = "development" ]; then + echo "On development branch already, no merge needed" else git config --global user.email "circleci@example.com" git config --global user.name "CircleCI" - git checkout v5.0.0 + git checkout development git merge --no-edit --no-ff $CIRCLE_BRANCH fi - dependencies_setup