Adjust CircleCI and Github Actions to account for new branch names v4…

…_development and v4_main (#4413)
Dash-Industry-Forum · Mar 11, 2024 · e5c66cd · e5c66cd
1 parent 1249205
commit e5c66cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -111,11 +111,11 @@ jobs:
         steps:
             - checkout
             -   run:
-                    name: Merge into development virtually
+                    name: Merge into v4_development virtually
                     command: |
                         git config --global user.email "circleci@example.com"
                         git config --global user.name "CircleCI"
-                        git checkout development
+                        git checkout v4_development
                         git merge --no-edit --no-ff $CIRCLE_BRANCH
             - dependencies_setup
             - build_unit_test_steps
@@ -126,14 +126,14 @@ jobs:
             - functional_precondition
             - checkout
             -   run:
-                    name: Virtual merge into development branch
+                    name: Virtual merge into v4_development branch
                     command: |
-                        if [ "${CIRCLE_BRANCH}" = "development" ]; then
-                            echo "On development branch already, no merge needed"
+                        if [ "${CIRCLE_BRANCH}" = "v4_development" ]; then
+                            echo "On v4_development branch already, no merge needed"
                         else
                             git config --global user.email "circleci@example.com"
                             git config --global user.name "CircleCI"
-                            git checkout development
+                            git checkout v4_development
                             git merge --no-edit --no-ff $CIRCLE_BRANCH
                         fi
             - dependencies_setup
@@ -148,7 +148,7 @@ jobs:
                     command:
                         node test/functional/runTests.js --selenium=remote --reporters=junit --debug=true --app=remote --browsers=chrome --protocol=https --source=./test/functional/config/smokeVectors.json
             - process_test_results
-    
+
     functional-tests-VOD_LIVE:
         executor: dashjs-executor
         steps:
@@ -202,7 +202,7 @@ workflows:
                     filters:
                         branches:
                             ignore:
-                                - development # skiping redundant job if already on development
+                                - v4_development # skiping redundant job if already on development
             -   functional-tests-smoke:
                     filters:
                         branches:
@@ -216,7 +216,7 @@ workflows:
                     filters:
                         branches:
                             only:
-                                - development
+                                - v4_development
         jobs:
             - functional-tests-VOD_LIVE
             - functional-tests-DRM

diff --git a/.github/workflows/deploy_latest.yml b/.github/workflows/deploy_latest.yml
@@ -1,16 +1,16 @@
-name: deploy
+name: deploy_v4_latest
 
 on:
     push:
         branches:
-            - 'master'
+            - 'v4_main'
 
 jobs:
     deploy_staging:
         if: github.repository == 'Dash-Industry-Forum/dash.js'
         uses: ./.github/workflows/deploy.yml
         with:
-            envname: latest
+            envname: v4_latest
             deploy_path: '/377335/dash.js'
         secrets:
             host: ${{secrets.HOST}}

diff --git a/.github/workflows/deploy_nightly.yml b/.github/workflows/deploy_nightly.yml
@@ -1,16 +1,16 @@
-name: deploy
+name: deploy_v4_nightly
 
 on:
     push:
         branches:
-            - 'development'
+            - 'v4_development'
 
 jobs:
     deploy_staging:
         if: github.repository == 'Dash-Industry-Forum/dash.js'
         uses: ./.github/workflows/deploy.yml
         with:
-            envname: nightly
+            envname: v4_nightly
             deploy_path: '/377335/dash.js'
         secrets:
             host: ${{secrets.HOST}}