diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f372768a6..7bea3b3a3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,5 +4,5 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" - target-branch: "develop" + interval: "weekly" + target-branch: "main" diff --git a/.github/workflows/check-api.yml b/.github/workflows/check-api.yml index 61e78836d..74d531715 100644 --- a/.github/workflows/check-api.yml +++ b/.github/workflows/check-api.yml @@ -3,10 +3,7 @@ on: push: branches: - main - - develop pull_request: - branches-ignore: - - documentation workflow_dispatch: diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml index 926f17d4e..39852bd99 100644 --- a/.github/workflows/containerized-ci.yml +++ b/.github/workflows/containerized-ci.yml @@ -3,10 +3,7 @@ on: push: branches: - main - - develop pull_request: - branches-ignore: - - documentation workflow_dispatch: jobs: diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ee14cb039..6df7f2a79 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -4,10 +4,7 @@ on: push: branches: - main - - develop pull_request: - branches-ignore: - - documentation workflow_dispatch: defaults: diff --git a/.github/workflows/doc-deployment.yml b/.github/workflows/doc-deployment.yml index 2c3a5c216..c93af1ade 100644 --- a/.github/workflows/doc-deployment.yml +++ b/.github/workflows/doc-deployment.yml @@ -3,7 +3,8 @@ on: push: branches: - main - - documentation + pull_request: + workflow_dispatch: jobs: Build: @@ -60,7 +61,7 @@ jobs: # Check broken links # - name: Broken Link Check - if: ${{ github.ref == 'refs/heads/documentation'}} + if: ${{ github.ref == 'refs/heads/main'}} uses: technote-space/broken-link-checker-action@v2 with: TARGET: file://${{ github.workspace }}/doc/ford_site/pages/index.html @@ -71,7 +72,7 @@ jobs: # - name: Deploy API Documentation uses: JamesIves/github-pages-deploy-action@v4.7.2 - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/documentation' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} with: branch: gh-pages folder: public/ diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml index 4b08fe737..309c223e8 100644 --- a/.github/workflows/gitlab-ci.yml +++ b/.github/workflows/gitlab-ci.yml @@ -3,10 +3,7 @@ on: push: branches: - main - - develop pull_request: - branches-ignore: - - documentation workflow_dispatch: defaults: diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 60205dd0f..009caf06a 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -3,10 +3,7 @@ on: push: branches: - main - - develop pull_request: - branches-ignore: - - documentation workflow_dispatch: jobs: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b521c80e..b8ff2ac9d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ ci: autofix_prs: false - autoupdate_branch: develop + autoupdate_branch: main repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/Contributing.md b/Contributing.md index 4f73b1f7e..d8524d6a7 100644 --- a/Contributing.md +++ b/Contributing.md @@ -14,6 +14,6 @@ Please fork this repository, branch from `main`, make your changes, and open a G ##### Did you add functionality? -Please fork this repository, branch from `develop`, make your changes, and open a Github [pull request](https://github.com/RobertPincus/rte-rrtmgp/pulls) against branch `main`, adding a new regression test or comparison against the reference in `tests/verification.py` or `tests/validation-plots.py` as appropriate. Add the test to `CMakeLists.txt` in the relevant directory. +Please fork this repository, branch from `main`, make your changes, and open a Github [pull request](https://github.com/RobertPincus/rte-rrtmgp/pulls) against branch `main`, adding a new regression test or comparison against the reference in `tests/verification.py` or `tests/validation-plots.py` as appropriate. Add the test to `CMakeLists.txt` in the relevant directory. RTE+RRTMGP is intended to be a core that users can extend with custom code to suit their own needs.