diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a6d012e3f0..dfa5fb20de 100644 --- a/.github/workflows/docs.yml +++ b/.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 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 3c3b3136da..d0d5cc2f00 100644 --- a/.github/workflows/linter.yml +++ b/.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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4561b2650..a8fe2cd73c 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/.vscode/settings.json b/.vscode/settings.json index c2df4bc2a8..88b18e9481 100644 --- a/.vscode/settings.json +++ b/.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", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cab4ef6ccc..cd950287fc 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/README.md b/README.md index b1950e85ac..ce601d095b 100644 --- a/README.md +++ b/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 diff --git a/docs/github-repo/configuration.rst b/docs/github-repo/configuration.rst index bf29224cc9..6729d8a268 100644 --- a/docs/github-repo/configuration.rst +++ b/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.