Skip to content

Commit 695e16a

Browse files
authored
Merge pull request #265 from cmu-delphi/dev
v1.1.1 release
2 parents 0adb796 + 1356f60 commit 695e16a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3113
-994
lines changed

.Rbuildignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@
2020
^.venv$
2121
^env$
2222
^.env$
23+
^README\.Rmd$
2324
^CRAN-SUBMISSION$
25+
^LICENSE\.md$
26+
^revdep$

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.0.0
2+
current_version = 1.0.0.9000
33
commit = False
44
tag = False
55

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @dshemetov @brookslogan @dsweber2
1+
* @dshemetov @brookslogan @dsweber2 @nmdefries

.github/pull_request_template.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
### Checklist
2+
3+
Please:
4+
5+
- [ ] Make sure this PR is against "dev", not "main" (unless this is a release
6+
PR).
7+
- [ ] Request a review from one of the current epidatr main reviewers:
8+
brookslogan, dshemetov, nmdefries, dsweber2.
9+
- [ ] Makes sure to bump the version number in `DESCRIPTION`. Always increment
10+
the patch version number (the third number), unless you are making a
11+
release PR from dev to main, in which case increment the minor version
12+
number (the second number).
13+
- [ ] Describe changes made in NEWS.md, making sure breaking changes
14+
(backwards-incompatible changes to the documented interface) are noted.
15+
Collect the changes under the next release number (e.g. if you are on
16+
1.7.2, then write your changes under the 1.8 heading).
17+
18+
### Change explanations for reviewer
19+
20+
### Magic GitHub syntax to mark associated Issue(s) as resolved when this is merged into the default branch
21+
22+
- Resolves #{issue number}

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [main, dev]
66
pull_request:
77
branches: [main, dev]
8+
workflow_dispatch:
89

910
name: R-CMD-check
1011

.github/workflows/create_release.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/document.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
push:
5-
paths: ["R/**"]
5+
paths: ["R/**", "README.Rmd"]
6+
workflow_dispatch:
67

78
name: Document
89

@@ -26,17 +27,25 @@ jobs:
2627
- name: Install dependencies
2728
uses: r-lib/actions/setup-r-dependencies@v2
2829
with:
29-
extra-packages: any::roxygen2
30-
needs: roxygen2
30+
extra-packages: |
31+
any::devtools
32+
any::roxygen2
33+
needs: |
34+
devtools
35+
roxygen2
3136
3237
- name: Document
3338
run: roxygen2::roxygenise()
3439
shell: Rscript {0}
3540

41+
- name: Build README.md from README.Rmd
42+
run: Rscript -e 'devtools::build_readme()'
43+
3644
- name: Commit and push changes
3745
run: |
3846
git config --local user.name "$GITHUB_ACTOR"
3947
git config --local user.email "[email protected]"
48+
git add README.md
4049
git add man/\* NAMESPACE DESCRIPTION
4150
git commit -m "docs: document (GHA)" || echo "No changes to commit"
4251
git pull --rebase

.github/workflows/lint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [main, dev]
66
pull_request:
77
branches: [main, dev]
8+
workflow_dispatch:
89

910
name: lint
1011

.github/workflows/pkgdown.yaml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# update the documentation web site on pushes to `dev` branch.
66
on:
77
push:
8-
branches: [main]
8+
branches: [main, dev]
99
pull_request:
10-
branches: [main]
10+
branches: [main, dev]
1111
release:
1212
types: [published]
1313
workflow_dispatch:
@@ -23,7 +23,7 @@ jobs:
2323
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
2424
env:
2525
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
26-
DELPHI_EPIDATA_KEY: ${{ secrets.DELPHI_GITHUB_ACTIONS_EPIDATA_API_KEY }}
26+
DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIDATR_GHACTIONS_DELPHI_EPIDATA_KEY }}
2727
steps:
2828
- uses: actions/checkout@v3
2929

@@ -35,13 +35,29 @@ jobs:
3535

3636
- uses: r-lib/actions/setup-r-dependencies@v2
3737
with:
38-
extra-packages: any::pkgdown, local::.
38+
extra-packages: any::pkgdown, local::., any::cli
3939
needs: website
4040

4141
- name: Build site
42-
env:
43-
DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIDATR_GHACTIONS_DELPHI_EPIDATA_KEY }}
44-
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
42+
run: |
43+
override <- if (startsWith("${{ github.event_name }}", "pull_request")) {
44+
if ("${{ github.base_ref }}" == "main") {
45+
list(development = list(mode = "release", version_label = "light"))
46+
} else {
47+
list(development = list(mode = "devel", version_label = "success"))
48+
}
49+
} else {
50+
if ("${{ github.ref_name }}" == "main") {
51+
list(development = list(mode = "release", version_label = "light"))
52+
} else {
53+
list(development = list(mode = "devel", version_label = "success"))
54+
}
55+
}
56+
pkg <- pkgdown::as_pkgdown(".", override = override)
57+
cli::cli_rule("Cleaning files from old site...")
58+
pkgdown::clean_site(pkg)
59+
pkgdown::build_site(pkg, preview = FALSE, install = FALSE, new_process = FALSE)
60+
pkgdown:::build_github_pages(pkg)
4561
shell: Rscript {0}
4662

4763
- name: Deploy to GitHub pages 🚀

.github/workflows/release_helper.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)