diff --git a/.github/workflows/build-init.yml b/.github/workflows/build-init.yml index 7155937..a09639c 100644 --- a/.github/workflows/build-init.yml +++ b/.github/workflows/build-init.yml @@ -2,7 +2,7 @@ name: CI-build on: push: - branches: [develop] + branches: [main] pull_request: paths-ignore: ['docs/**'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffcf055..7e36916 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,9 @@ name: CD -# This process takes over an hour, -# so we only run when pushing to the master branch, or creating a new tag/release +# This process takes over two hours, +# so we only run when creating a new tag/release on: push: - branches: [master] tags: - '*' # pull_request: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b99f65..f10426d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [master, develop] + branches: [main] tags: - '*' pull_request: diff --git a/docs/conf.py b/docs/conf.py index 4d575f9..bbe7e8f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,7 +54,7 @@ html_theme_options = { "home_page_in_toc": True, "repository_url": "https://github.com/marvel-nccr/quantum-mobile", - "repository_branch": "develop", + "repository_branch": "main", "use_repository_button": True, "use_issues_button": True, "path_to_docs": "docs", diff --git a/docs/maintainers/release.md b/docs/maintainers/release.md index 78c4b10..07d0a05 100644 --- a/docs/maintainers/release.md +++ b/docs/maintainers/release.md @@ -55,8 +55,7 @@ To prepare the release: * Release the distributions (see below) * Copy `dist/Release-.md` to `docs/releases/` and add the top-matter section. * Update `CHANGELOG.md` -* Commit changes of quantum-mobile repository to `develop` branch -* merge into `master` +* Commit changes of quantum-mobile repository to `main` branch * [create new GitHub release](https://github.com/marvel-nccr/quantum-mobile/releases/new), copying content of `dist/Release-.md` (replace `Changelog` section with link to documentation) file and `CHANGELOG.md` ### Desktop Edition