update branch names in docs and workflows

.github/workflows/docs.yml

@@ -3,12 +3,12 @@ name: Docs
 on:
   push:
     branches:
-      - master
+      - develop
     paths:
       - "docs/**"
   pull_request:
     branches:
-      - master
+      - develop
     paths:
       - "docs/**"
   workflow_dispatch:
@@ -46,7 +46,7 @@ jobs:
           retention-days: 30
 
   deploy-docs:
-    if: github.repository == 'coronasafe/care' && github.ref == 'refs/heads/master'
+    if: github.repository == 'coronasafe/care' && github.ref == 'refs/heads/develop'
     name: Deploy docs
     runs-on: ubuntu-latest
     needs: build-docs

.github/workflows/linter.yml

@@ -2,7 +2,9 @@ name: Lint Code Base
 
 on:
   pull_request:
-    branches: [master]
+    branches:
+      - develop
+      - staging
   merge_group:
 
 jobs:
@@ -24,7 +26,7 @@ jobs:
       - name: Lint Code Base
         uses: github/super-linter/slim@v5
         env:
-          DEFAULT_BRANCH: master
+          DEFAULT_BRANCH: develop
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_PYTHON_BLACK: true

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
     rev: v4.4.0
     hooks:
       - id: no-commit-to-branch
-        args: [--branch, master, --branch, production]
+        args: [--branch, develop, --branch, staging, --branch, production]
       - id: check-merge-conflict
       - id: check-builtin-literals
       - id: mixed-line-ending

.vscode/settings.json

@@ -18,7 +18,7 @@
   },
   "files.trimFinalNewlines": true,
   "files.trimTrailingWhitespace": true,
-  "githubPullRequests.ignoredPullRequestBranches": ["master"],
+  "githubPullRequests.ignoredPullRequestBranches": ["develop", "staging"],
   "python.formatting.blackPath": "${workspaceFolder}/.venv/bin/black",
   "python.formatting.provider": "black",
   "python.languageServer": "Pylance",

CONTRIBUTING.md

@@ -23,7 +23,7 @@ pre-commit install
 
 to run pre-commit on your branch:
 ```bash
-pre-commit run --files $(git diff --name-only master...HEAD)
+pre-commit run --files $(git diff --name-only develop...HEAD)
 ```
 
 #### Using Docker

README.md

@@ -36,10 +36,11 @@ You can find the docs at https://care-be-docs.coronasafe.network
 
 ### Staging Deployments
 
-Staging instances for testing are automatically deployed on every commit to the `master` branch. The staging instances
-are available at:
+Dev and staging instances for testing are automatically deployed on every commit to the `develop` and `staging` branches.
+The staging instances are available at:
 
 - https://careapi.ohc.network
+- https://careapi-staging.ohc.network
 
 ### Self hosting
 

docs/github-repo/configuration.rst

@@ -3,7 +3,9 @@ GitHub Repository
 
 The Github Repo available here_ contains the source code for the care project, Apart from the secrets configured at runtime, the exact copy is deployed in production.
 
-The :code:`master` branch auto deploys to the Development instance and is regarded as the Beta version of the application.
+The :code:`develop` branch auto deploys to the Development instance and is regarded as the Beta version of the application.
+
+The :code:`staging` branch auto deploys to the Staging instance and is regarded as the Release Candidate version of the application.
 
 The :code:`production` branch auto deploys to Production instance and is regarded as the Stable version of the application.