#2714: Migrate git branches from "develop" to "main" and "master" to "release"

Author: pbek

.github/workflows/build-deploy-webpage.yml

@@ -1,7 +1,7 @@
 name: Build and Deploy Webpage
 on:
   push:
-    branches: [ develop ]
+    branches: [ main ]
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-including-paths
     # if [[ ${changed_file} == "CHANGELOG.md" ]] || [[ ${changed_file} = screenshots* ]] || [[ ${changed_file} = webpage* ]] || [[ ${changed_file} = ".github/workflows/build-deploy-webpage.yml" ]] ;
     paths:

.github/workflows/build-release-qt6.yml

@@ -3,9 +3,9 @@ name: Build release of QOwnNotes Qt6
 on:
   push:
     branches:
-#      - master
-      # For testing also on develop branch
-      - develop
+#      - release
+      # For testing also on main branch
+      - main
     tags-ignore:
       - '*'
   # For testing also on pull requests

.github/workflows/build-release.yml

@@ -3,8 +3,8 @@ name: Build and Release QOwnNotes
 on:
   push:
     branches:
-      - master
-#      - develop
+      - release
+#      - main
     tags-ignore:
       - '*'
 

.github/workflows/build-test.yml

@@ -3,7 +3,7 @@ name: Build QOwnNotes
 on:
   push:
     branches-ignore:
-      - master
+      - release
     tags-ignore:
       - '*'
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-including-paths

.github/workflows/build-webpage.yml

@@ -1,13 +1,13 @@
 name: Build Webpage
 on:
   push:
-    branches: [ develop ]
+    branches: [ main ]
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-including-paths
     # if [[ ${changed_file} == "CHANGELOG.md" ]] || [[ ${changed_file} = screenshots* ]] || [[ ${changed_file} = webpage* ]] || [[ ${changed_file} = ".github/workflows/build-webpage.yml" ]] ;
     paths:
       - '.github/workflows/build-webpage.yml'
   pull_request:
-    branches: [ develop ]
+    branches: [ main ]
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-including-paths
     # if [[ ${changed_file} == "CHANGELOG.md" ]] || [[ ${changed_file} = screenshots* ]] || [[ ${changed_file} = webpage* ]] || [[ ${changed_file} = ".github/workflows/build-webpage.yml" ]] ;
     paths:

.gitlab-ci.yml

@@ -25,8 +25,8 @@ build_job:
   script:
     - echo do some testing...
   only:
-    - develop
-    - master
+    - main
+    - release
 
 deployment_job:
   type: deploy
@@ -48,4 +48,4 @@ deployment_job:
     - ../gitlab-ci/deploy-file.sh $RELEASE_ID $GITHUB_ACCESS_TOKEN
 
   only:
-    - master
+    - release

.travis.disabled.yml

@@ -9,8 +9,8 @@ os:
 
 branches:
   only:
-    - develop
-    - master
+    - main
+    - release
     - testing
     - /^feature.+$/
 
@@ -76,7 +76,7 @@ script:
   - cd ./tests
   - qmake DEFINES+=INTEGRATION_TESTS CONFIG+=ccache && make -s -j 2
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-      if [ "${TRAVIS_BRANCH}" != "master" ]; then
+      if [ "${TRAVIS_BRANCH}" != "release" ]; then
            ./../bin/tests/tests -platform minimal -txt
         && ../travis/linux/coveralls.sh
         ;
@@ -123,7 +123,7 @@ before_deploy:
   - git config --global user.email "[email protected]"
   - git config --global user.name "Travis CI"
   - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-        if [ "${TRAVIS_BRANCH}" == "master" ]; then
+        if [ "${TRAVIS_BRANCH}" == "release" ]; then
             export GIT_TAG=linux-b$TRAVIS_BUILD_NUMBER-$TIME_STRING
             ;
         else
@@ -132,7 +132,7 @@ before_deploy:
         fi
         ;
     else
-        if [ "${TRAVIS_BRANCH}" == "master" ]; then
+        if [ "${TRAVIS_BRANCH}" == "release" ]; then
             export GIT_TAG=macosx-b$TRAVIS_BUILD_NUMBER-$TIME_STRING
             ;
         else
@@ -145,26 +145,26 @@ before_deploy:
   - git push -q https://[email protected]/pbek/QOwnNotes --tags >/dev/null 2>&1
 
 deploy:
-    # Linux master release
+    # Linux release release
   - provider: releases
     api_key:
         secure: DaUepv9X3aPy91r8FBCyA0yUEQ0CNYQyA5EzlXsvLWsTi7XjscWZXCkv2BoFxk+MXvsCweaS6/qRbIn8/cW1TFLo6ZAbHjucnmjtSZn9wr9j3SEV7fM6jpAc6XBMMHtgjCaKZMpvH1R2Ed6O3DNr7L0//zB/PDhQx+rDeDre1kA=
     file: QOwnNotes-$VERSION_NUMBER.deb
     skip_cleanup: true
     on:
         repo: pbek/QOwnNotes
-        branch: master
+        branch: release
         tags: false
         condition: $CONFIG = release && ${TRAVIS_OS_NAME} = linux
-    # macOS master release
+    # macOS release release
   - provider: releases
     api_key:
         secure: DaUepv9X3aPy91r8FBCyA0yUEQ0CNYQyA5EzlXsvLWsTi7XjscWZXCkv2BoFxk+MXvsCweaS6/qRbIn8/cW1TFLo6ZAbHjucnmjtSZn9wr9j3SEV7fM6jpAc6XBMMHtgjCaKZMpvH1R2Ed6O3DNr7L0//zB/PDhQx+rDeDre1kA=
     file: QOwnNotes-$VERSION_NUMBER.dmg
     skip_cleanup: true
     on:
         repo: pbek/QOwnNotes
-        branch: master
+        branch: release
         tags: false
         condition: $CONFIG = release && ${TRAVIS_OS_NAME} = osx
     # Linux development release
@@ -175,7 +175,7 @@ deploy:
 #    skip_cleanup: true
 #    on:
 #        repo: pbek/QOwnNotes
-#        branch: develop
+#        branch: main
 #        tags: false
 #        condition: ${TRAVIS_OS_NAME} = linux
     # macOS development release
@@ -187,7 +187,7 @@ deploy:
 #    skip_cleanup: true
 #    on:
 #        repo: pbek/QOwnNotes
-#        branch: develop
+#        branch: main
 #        tags: false
 #        condition: ${TRAVIS_OS_NAME} = osx