Skip to content

Commit 679998b

Browse files
authored
Merge branch 'dev' into unpack-cfr
2 parents ac995b2 + 88b59df commit 679998b

23 files changed

+6638
-227
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
/assets/jsconfig.json
1212
/static/uikit/**
1313
.DS_Store
14+
*.zip
15+
*.tgz

.release-it.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"hooks": {
3+
"before:init": "npm run lint",
4+
"before:release": "npm run build && npm run zip",
5+
"after:release": "echo Successfully released ${name} v${version}."
6+
},
7+
"git": {
8+
"tagName": "v${version}"
9+
},
10+
"npm": {
11+
"publish": false
12+
},
13+
"github": {
14+
"release": true,
15+
"assets": ["website.zip"]
16+
}
17+
}

README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,16 @@ In case you use new dependencies don't forget to either edit `environment.yml` o
103103
A Github action should runs when Rmd files changes so it will verify that the blog post can be built.
104104
However, the converted HTML file along with all generated images are committed to the repository.
105105
This simplifies the deployment and ensures that we have a blog post even when the API or data changes.
106+
107+
108+
### Release Process
109+
110+
The release process is based on [release-it](https://github.com/release-it/release-it). To create a release, run
111+
112+
1. create/checkout the release branch `release` and push to origin
113+
1. run `npm run release` and publish the release
114+
1. create a PR that merges the `release` branch in the `main` branch
115+
1. create a PR that merges the `main` branch back into the `dev` branch
116+
117+
Then go to the release page and update short description of the changes made.
118+

content/blog/2021-01-28-survey-vaccines.Rmd

Lines changed: 353 additions & 0 deletions
Large diffs are not rendered by default.

content/blog/2021-01-28-survey-vaccines.html

Lines changed: 330 additions & 0 deletions
Large diffs are not rendered by default.

data/authors.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,12 @@
5454
name: Zachary Chase Lipton
5555
link: https://acmilab.org
5656
description: is an Assistant Professor of Operations Research and Machine Learning at CMU and is a member of Delphi.
57+
- key: ekim
58+
name: Esther Kim
59+
description: is a Research Scientist on the Demography and Survey Science team at Facebook.
60+
- key: agarcia
61+
name: Andy Garcia
62+
description: is a Data Scientist on the Health team at Facebook.
63+
- key: slarocca
64+
name: Sarah LaRocca
65+
description: is a Research Scientist on the Demography and Survey Science team at Facebook.

0 commit comments

Comments
 (0)