ci: update merge action to main

bpmn-io · Dec 20, 2023 · 7f4c040 · 7f4c040
1 parent 1d4056f
commit 7f4c040
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...hub/workflows/MERGE_MASTER_TO_DEVELOP.yml → .github/workflows/MERGE_MAIN_TO_DEVELOP.yml b/...hub/workflows/MERGE_MASTER_TO_DEVELOP.yml → .github/workflows/MERGE_MAIN_TO_DEVELOP.yml
@@ -1,11 +1,11 @@
-name: MERGE_MASTER_TO_DEVELOP
+name: MERGE_MAIN_TO_DEVELOP
 on:
   push:
     branches:
-    - "master"
+    - "main"
 
 jobs:
-  Merge_master_to_develop:
+  Merge_main_to_develop:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -16,11 +16,11 @@ jobs:
       with:
         ref: develop
         fetch-depth: 0
-    - name: Merge master to develop and push
+    - name: Merge main to develop and push
       run: |
         git config user.name github-actions
         git config user.email [email protected]
-        git merge -m 'Merge master to develop' --no-edit origin/master
+        git merge -m 'Merge main to develop' --no-edit origin/main
         git push
 
     - name: Notify failure on Slack