Skip to content

Commit 114a292

Browse files
authored
Merge pull request #886 from cmu-delphi/sgratzl/contributing
docs: update release process and contributing guide
2 parents 085fca9 + 5b7613d commit 114a292

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
lines changed

.github/CONTRIBUTING.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,6 @@ The discussion / comments within an issue should restrict to the topic of the is
2525

2626
Issues are assigned to a single user which is responsible for the implementation of the issue eventually leading to a pull request.
2727

28-
## Project Board
29-
30-
The main project board is located at https://github.com/cmu-delphi/www-covidcast/projects/2.
31-
32-
The columns have the following meaning:
33-
34-
- `To Do`
35-
36-
contains newly created issues that needs still to be evaluated and discussed and not yet ready to be implemented
37-
38-
- `Up Next`
39-
40-
contains assigned issues that should be implemented next. The top most issue has the highest priority
41-
42-
- `In Progress`
43-
44-
once a developer starts working on an issue he/she should move the issue from the `Up Next` to the `In Progress` column indicating that it is currently implemented
45-
46-
- `In Review`
47-
48-
after creating the pull request for an issue the pull request card as well as the corresponding issue card are moved to the `In Review` column indicating that they can be reviewed and tested.
49-
50-
- `Done`
51-
52-
after merging the pull request, the pull request and issue cards can be moved to the `Done` column
53-
54-
- `Icebox`
55-
56-
the `Icebox` column contains issues that open for discussion, have no specific plan, or longer future ideas
57-
5828
## Pull Requests
5929

6030
The purpose of a pull request is to merge the solution to an existing issue into the current `dev` branch.

.gitpod.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
tasks:
2+
- init: npm install
3+
- command: npm start
4+
ports:
5+
- port: 8080
6+
vscode:
7+
extensions:
8+
- dbaeumer.vscode-eslint
9+
- esbenp.prettier-vscode
10+
- svelte.svelte-vscode

README.md

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,71 @@ The next `dev` version is deployed at https://dev--cmu-delphi-covidcast.netlify.
1010

1111
## Figma Mock-Ups
1212

13-
Located at: https://www.figma.com/file/CZ3YwWBL2md9j39qdcBfDs/COVIDCast?node-id=0%3A1
13+
Located at: [Figma Delphi-Site-Redesign](https://www.figma.com/file/IiYu74VmEi4GVS4bnYaTd6/Delphi-Site-Redesign).
1414

1515
## Development Environment
1616

17+
One click solution: [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delphi/www-covidcast)
18+
1719
`node` and `npm` are required for development.
1820

1921
To begin development, clone this repository and run
2022

21-
`npm install`
23+
```sh
24+
npm install
25+
```
2226

2327
To lint or check for styling, run
2428

25-
`npm run lint`
29+
```sh
30+
npm run lint
31+
```
2632

2733
To run unit test, run
2834

29-
`npm run test`
35+
```sh
36+
npm test
37+
```
3038

3139
To run e2e test, run
3240

33-
`npm run build && npm run test:e2e`
41+
```sh
42+
npm run build
43+
```
3444

3545
To run the development server, run
3646

37-
`npm start`
47+
```sh
48+
npm start
49+
```
3850

39-
the website should open automatically.
51+
the website is then accessible via: http://localhost:8080/
4052

4153
To run e2e test against the development server, run
4254

43-
`npm start`
55+
```sh
56+
npm start
57+
```
58+
4459
in a separate shell:
4560

46-
`npm run cy:open`
61+
```sh
62+
npm run cy:open
63+
```
4764

4865
### Release Process
4966

50-
To create a release, run
51-
52-
1. create a release branch `release-vX.X.X` and push to origin
53-
1. run `npm run release` and publish the release
54-
1. create a PR that merges the `release` branch in the `main` branch
55-
1. create a PR that merges the `main` branch back into the `dev` branch
56-
57-
Then go to the release page and update short description of the changes made.
67+
The release consists of multiple stets which can be all done via the GitHub website:
68+
69+
1. Go to [create_release GitHub Action](https://github.com/cmu-delphi/www-covidcast/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.
70+
1. The action will prepare a new release and will end up with a new [Pull Request](https://github.com/cmu-delphi/www-covidcast/pulls)
71+
1. Let the code owner review the PR and its changes and let the CI check whether everything builds successfully
72+
1. Once approved and merged, another GitHub action job starts which automatically will
73+
1. create a git tag
74+
1. create another [Pull Request](https://github.com/cmu-delphi/www-covidcast/pulls) to merge the changes back to the `dev` branch
75+
1. create a [GitHub release](https://github.com/cmu-delphi/www-covidcast/releases) with automatically derived release notes
76+
1. create a [Pull Request in www-main](https://github.com/cmu-delphi/www-main/pulls) to update the website to the new release
77+
1. Done
5878

5979
## License
6080

0 commit comments

Comments
 (0)