Skip to content

Commit b7c9f75

Browse files
Merge pull request #95 from CodeForPhilly/docs/release-process
Docs/release process
2 parents 645dae9 + 0ac141a commit b7c9f75

File tree

5 files changed

+36
-11
lines changed

5 files changed

+36
-11
lines changed

.github/workflows/gh-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish GitBook to GH Pages
33
on:
44
push:
55
branches:
6-
- 'releases/v1'
6+
- 'develop'
77

88

99
jobs:
@@ -25,6 +25,6 @@ jobs:
2525
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2626
HAB_LICENSE: accept
2727
with:
28-
ref: master
28+
ref: develop
2929
holobranch: gh-pages
3030
commit-to: gh-pages

docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
This book is the living documentation for developers and operators working on [the CHIME project](https://github.com/CodeForPhilly/chime) or running instances of it.
44

5-
It is maintained in the [GitBook format](https://gitbookio.gitbooks.io/docs-toolchain/structure.html) within [the `docs/` directory](https://github.com/CodeForPhilly/chime/tree/master/docs) of the project's main Git repository, and new versions are published automatically upon merge to the `master` branch to: [codeforphilly.github.io/chime](https://codeforphilly.github.io/chime)
5+
It is maintained in the [GitBook format](https://gitbookio.gitbooks.io/docs-toolchain/structure.html) within [the `docs/` directory](https://github.com/CodeForPhilly/chime/tree/develop/docs) of the project's main Git repository, and new versions are published automatically upon merge to the `develop` branch to: [codeforphilly.github.io/chime](https://codeforphilly.github.io/chime)
66

7-
To contribute to this book, please [open a pull request against the master branch of github.com/CodeForPhilly/chime](https://github.com/CodeForPhilly/chime/compare/master).
7+
To contribute to this book, please [open a pull request against the develop branch of github.com/CodeForPhilly/chime](https://github.com/CodeForPhilly/chime/compare/develop).

docs/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- [Data Analysis](contributing/data-analysis.md)
1010
- [Operations Support](contributing/operations-support.md)
1111
- Operations
12+
- [Release Process](./operations/release-process.md)
1213
- [The `chime-live` Cluster](./operations/chime-live-cluster.md)
1314
- [Deploy to Heroku](./operations/heroku.md)
1415
- [Deploy to Your Own Cluster](./operations/byok8s.md)

docs/operations/chime-live-cluster.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,17 @@
3232

3333
## Deploying a New CHIME Version
3434

35-
1. Merge new version into `master` branch
36-
2. Create a new release tag in the format `v1.2.3`, incrementing semantically
37-
3. Wait for the `Docker` GitHub Actions workflow to complete
38-
4. Verify the new version shows up at the top as "Latest version" here: https://github.com/CodeForPhilly/chime/packages/155340
39-
5. Run:
35+
1. [MaCreateke a new release](release-process.md)
36+
2. Wait for the `Docker` GitHub Actions workflow to complete
37+
3. Verify the new version shows up at the top as "Latest version" here: https://github.com/CodeForPhilly/chime/packages/155340
38+
4. Run:
4039

4140
```bash
4241
VERSION=1.2.3
4342
kubectl set image --record deployment/chime chime="docker.pkg.github.com/codeforphilly/chime/penn-chime:${VERSION}"
4443
```
4544

46-
6. Watch rollout status:
45+
5. Watch rollout status:
4746

4847
```bash
4948
kubectl rollout status deployment.v1.apps/chime
@@ -68,5 +67,5 @@ kubectl apply -f k8s/infra/ingress-nginx.yaml
6867
Or the entire directory:
6968

7069
```bash
71-
kubectl diff -Rf k8s/
70+
kubectl apply -Rf k8s/
7271
```

docs/operations/release-process.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Operations: Release Process
2+
3+
1. Merge pull requests into `develop`
4+
2. Chose a new version number by incrementing the previous release according to [semver](https://semver.org/)
5+
- Do not bump the MAJOR version unless the team is ready to create a new `releases/v#` branch
6+
3. Open a pull request to merge `develop` into `releases/v1`
7+
- **Title**: `Release: CHIME v1.#.#`
8+
- **Description**: Generate with this command:
9+
10+
```bash
11+
git fetch origin
12+
git log \
13+
--first-parent \
14+
--reverse \
15+
--pretty=format:"- %s" \
16+
"origin/releases/v1..origin/develop"
17+
```
18+
19+
4. Get release pull request approved by [`@cjbayesian`](https://github.com/cjbayesian) or [`@mdbecker`](https://github.com/mdbecker)
20+
5. Merge the pull request
21+
6. [Create a new release against `releases/v1`](https://github.com/CodeForPhilly/chime/releases/new?target=releases/v1)
22+
- **Tag version:** `v1.#.#`
23+
- **Release Title:** `CHIME v1.#.#`
24+
- **Description:** Copy release notes from pull request
25+
7. [Deploy to the `chime-live` cluster](chime-live-cluster.md)

0 commit comments

Comments
 (0)