Fix CircleCI config, move away from v5.0.0 branch (#4412)

Dash-Industry-Forum · Mar 11, 2024 · c93a08e · c93a08e
1 parent f9d9eb4
commit c93a08e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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 "[email protected]"
                         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 "[email protected]"
                             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