Skip to content

Commit 145992c

Browse files
authored
Update release package guidelines (#586)
* update release guidelines
1 parent cf41ba4 commit 145992c

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ on:
1313
- '.github/workflows/build_docs.yml' # mkdocs GH workflow
1414

1515
pull_request:
16-
types:
17-
- opened
18-
- reopened
16+
types:
17+
- opened
18+
- reopened
1919

2020
release:
2121
types:

CONTRIBUTING.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,21 @@ patch.object(MODULE_NAME, "FUNCTION_TO_MOCK_NAME".return_value=SOME_RETURN_VALUE
141141
Follow gitflow best practices as linked above.
142142

143143
1. Always merge all new features into `develop` branch first (unless it is a documentation, readme, or github action patch into `main`)
144-
1. After initial features are ready in the `develop` branch, create a `release-X.X` branch (do not need to push this branch to remote) to prepare for the release.
144+
2. After initial features are ready in the `develop` branch, create a `release-X.X` branch (**do not** push this branch to remote) to prepare for the release.
145145
1. update the `__version__` parameter in `genie/__init__.py`
146-
1. Merge `release-X.X` branch into `main` - Not by pull request!
147-
1. Create release tag (`v...`) and a brief message
148-
1. Push tag and change(s) from `main`
149-
1. Create a new release on the repo. Include release notes. Also include any known bugs for each release here. Wait for the CI/CD to finish.
150-
1. Merge `main` back into `develop`
151-
1. Push `develop`
146+
3. Merge `release-X.X.X` branch into `main` - Not by pull request! Resolve any merge conflicts.
147+
4. Create release tag (`v...`) and a brief message
148+
149+
```bash
150+
git tag -a v<X.X.X> -m "Release <X.X.X>"
151+
```
152+
153+
5. Prior to pushing changes into `main`, reset any annotations on the test project/rename maf database table as integration tests will run.
154+
6. Push tag and change(s) from `main`.
155+
7. Create a new release on the repo. Include release notes. See [writing release notes for project](https://sagebionetworks.jira.com/wiki/spaces/DPE/pages/3892543489/Writing+release+notes+for+projects) for creating informative technical release notes. See [example release](https://github.com/Sage-Bionetworks/Genie/releases/tag/v16.5.0) for typical sections to include in a Genie release. Also include any known bugs for each release here. Wait for the CI/CD to finish.
156+
8. Merge `main` back into `develop`
157+
9. Prior to pushing changes into `develop`, reset any annotations on the test project/rename maf database table as integration tests will run.
158+
10. Push changes in `develop`. Wait for the CI/CD to finish
152159

153160
### Modifying Docker
154161

0 commit comments

Comments
 (0)