Skip to content

Commit 17d22d9

Browse files
authored
Merge pull request #567 from cmu-delphi/delphidocs-dev
delphidocs on dev
2 parents 192f04b + 4970ff4 commit 17d22d9

File tree

3 files changed

+22
-41
lines changed

3 files changed

+22
-41
lines changed

.github/workflows/pkgdown.yaml

+6-11
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2929
DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIPROCESS_GHACTIONS_DELPHI_EPIDATA_KEY }}
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- uses: r-lib/actions/setup-pandoc@v2
3434

@@ -42,19 +42,14 @@ jobs:
4242
needs: website
4343

4444
- name: Build site
45-
# - target_ref gets the ref from a different variable, depending on the event
46-
# - override allows us to set the pkgdown mode and version_label
47-
# - mode: release is the standard build mode, devel places the site in /dev
48-
# - version_label: 'light' and 'success' are CSS labels for Bootswatch: Cosmo
49-
# https://bootswatch.com/cosmo/
50-
# - we use pkgdown:::build_github_pages to build the site because of an issue in pkgdown
51-
# https://github.com/r-lib/pkgdown/issues/2257
45+
# our versioning system+dev branch doesn't match the requirements for
46+
# develop mode = auto
5247
run: |
5348
target_ref <- "${{ github.event_name == 'pull_request' && github.base_ref || github.ref }}"
5449
override <- if (target_ref == "main" || target_ref == "refs/heads/main") {
55-
list(development = list(mode = "release", version_label = "light"))
50+
list(development = list(mode = "release"))
5651
} else if (target_ref == "dev" || target_ref == "refs/heads/dev") {
57-
list(development = list(mode = "devel", version_label = "success"))
52+
list(development = list(mode = "devel"))
5853
} else {
5954
stop("Unexpected target_ref: ", target_ref)
6055
}
@@ -67,7 +62,7 @@ jobs:
6762

6863
- name: Deploy to GitHub pages 🚀
6964
if: github.event_name != 'pull_request'
70-
uses: JamesIves/github-pages-deploy-action@v4.4.1
65+
uses: JamesIves/github-pages-deploy-action@v4.5.0
7166
with:
7267
clean: false
7368
branch: gh-pages

DESCRIPTION

+2
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,12 @@ Suggests:
7272
VignetteBuilder:
7373
knitr
7474
Remotes:
75+
cmu-delphi/delphidocs,
7576
cmu-delphi/epidatasets,
7677
cmu-delphi/epidatr,
7778
glmgen/genlasso,
7879
reconverse/outbreaks
80+
Config/Needs/website: cmu-delphi/delphidocs
7981
Config/testthat/edition: 3
8082
Config/testthat/parallel: true
8183
Copyright: file inst/COPYRIGHTS

_pkgdown.yml

+14-30
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,25 @@
1-
# Colors should stay consistent across epipredict, epiprocess, and epidatr,
2-
# using Carnegie Red
3-
# https://www.cmu.edu/brand/brand-guidelines/visual-identity/colors.html
4-
5-
# This is to give a default value to the `mode` parameter in the
6-
# `pkgdown::build_site` function. This is useful when building the site locally,
7-
# as it will default to `devel` mode. In practice, this should all be handled
8-
# dynamically by the CI/CD pipeline.
91
development:
102
mode: devel
11-
version_label: success
123

134
template:
14-
bootstrap: 5
15-
bootswatch: cosmo
16-
bslib:
17-
font_scale: 1.0
18-
primary: "#C41230"
19-
success: "#B4D43C"
20-
link-color: "#C41230"
21-
22-
navbar:
23-
bg: primary
24-
type: light
5+
package: delphidocs
256

267
url: https://cmu-delphi.github.io/epiprocess/
278

289
home:
2910
links:
30-
- text: Introduction to Delphi's Tooling Work
31-
href: https://cmu-delphi.github.io/delphi-tooling-book/
32-
- text: Get the epipredict R package
11+
- text: The epipredict package
3312
href: https://cmu-delphi.github.io/epipredict/
34-
- text: Get the epidatr R package
35-
href: https://github.com/cmu-delphi/epidatr
36-
- text: Get the epidatasets R package
37-
href: https://cmu-delphi.github.io/epidatasets/
13+
sidebar:
14+
structure: [links, license, community, citation, authors, dev, related]
15+
components:
16+
related:
17+
title: Delphi packages and resources
18+
text: |
19+
* [The epidatr package](https://github.com/cmu-delphi/epidatr/)
20+
* [The epipredict package](https://cmu-delphi.github.io/epipredict/)
21+
* [The epidatasets package](https://cmu-delphi.github.io/epidatasets/)
22+
* [Introduction to Delphi's Tooling Work](https://cmu-delphi.github.io/delphi-tooling-book/)
3823
3924
articles:
4025
- title: Using the package
@@ -54,10 +39,9 @@ articles:
5439

5540
repo:
5641
url:
57-
home: https://github.com/cmu-delphi/epiprocess/tree/main/
58-
source: https://github.com/cmu-delphi/epiprocess/blob/main/
42+
home: https://github.com/cmu-delphi/epiprocess/
43+
source: https://github.com/cmu-delphi/epiprocess/
5944
issue: https://github.com/cmu-delphi/epiprocess/issues
60-
user: https://github.com/
6145

6246
reference:
6347
- title: "`epi_df` basics"

0 commit comments

Comments
 (0)