Skip to content

Commit

Permalink
🔧 MAINTAIN: Merge master/develop into main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjsewell committed Dec 1, 2020
1 parent ded926f commit 15ac46e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI-build

on:
push:
branches: [develop]
branches: [main]
pull_request:
paths-ignore: ['docs/**']

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [master, develop]
branches: [main]
tags:
- '*'
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions docs/maintainers/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ To prepare the release:
* Release the distributions (see below)
* Copy `dist/Release-<version>.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-<version>.md` (replace `Changelog` section with link to documentation) file and `CHANGELOG.md`

### Desktop Edition
Expand Down

0 comments on commit 15ac46e

Please sign in to comment.