Skip to content

Commit 7323a01

Browse files
authored
Merge pull request #297 from cmu-delphi/sgratzl/docs
update release process docs
2 parents 8a30682 + 5a52524 commit 7323a01

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

README.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Delphi Website
22

3-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delpih/www-main)
3+
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delphi/www-main)
44

55

6-
Delphi's homepage at https://cmu-delphi-main.netlify.app/
6+
The current stable `main` version is deployed at https://delphi.cmu.edu and https://cmu-delphi-main.netlify.app/.
7+
8+
The next `dev` version is deployed at https://staging.delphi.cmu.edu/ and https://dev--cmu-delphi-main.netlify.app/.
79

810
This site is based on [Hugo](https://gohugo.io) and uses [Prettier](https://prettier.io) for formatting.
911

@@ -49,7 +51,7 @@ In RMarkdown things are slightly more different since the R Markdown parser is u
4951

5052
## Development Environment
5153

52-
One click: [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delpih/www-main)
54+
One click: [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delphi/www-main)
5355

5456
### Web Editor Only
5557

@@ -84,7 +86,7 @@ In order to convert the Rmd files to HTML files for Hugo you also need to:
8486
- `local=TRUE` similar to `-D` to process draft files
8587
- `run_hugo=FALSE` to manually run hugo
8688
- `build_rmd=TRUE` force a (re)build of the Rmd pages
87-
1. Run blogdown to convert a single file to HTML: `Rscript -e 'blogdown::build_site(local=TRUE, run_hugo=FALSE, build_rmd="content/blog/<NAME>.Rmd")'`
89+
1. Run blogdown to convert a single file to HTML: `Rscript -e 'blogdown::build_site(local=TRUE, run_hugo=FALSE, build_rmd="content/blog/<NAME>.Rmd")'` where `<NAME>` should be replaced by the name of the Rmd file.
8890
1. Alternatively, run `npm run build:blog`
8991
1. Run Hugo server as usual
9092

@@ -101,12 +103,16 @@ This simplifies the deployment and ensures that we have a blog post even when th
101103

102104
### Release Process
103105

104-
The release process is based on [release-it](https://github.com/release-it/release-it). To create a release, run
105-
106-
1. create/checkout the release branch `release` and push to origin
107-
1. run `npm run release` and publish the release
108-
1. create a PR that merges the `release` branch in the `main` branch
109-
1. create a PR that merges the `main` branch back into the `dev` branch
110-
111-
Then go to the release page and update short description of the changes made.
106+
The release consists of multiple steps which can be all done via the GitHub website:
107+
108+
1. Go to [create_release GitHub Action](https://github.com/cmu-delphi/www-main/actions/workflows/create_release.yml) and click the `Run workflow` button. Enter the next version number or one of the magic keywords (patch, minor, major) and hit the green `Run workflow` button.
109+
1. The action will prepare a new release and will end up with a new [Pull Request](https://github.com/cmu-delphi/www-main/pulls)
110+
1. Let the code owner review the PR and its changes and let the CI check whether everything builds successfully
111+
1. Once approved and merged, another GitHub action job starts which automatically will
112+
1. create a git tag
113+
1. create another [Pull Request](https://github.com/cmu-delphi/www-main/pulls) to merge the changes back to the `dev` branch
114+
1. create a [GitHub release](https://github.com/cmu-delphi/www-main/releases) with automatically derived release notes
115+
1. create docker image and the production system will be notified to pull this update
116+
1. Once the jobs are completed the new release should be available at https://delphi.cmu.edu within minutes.
117+
1. Done
112118

0 commit comments

Comments
 (0)