Skip to content

Commit 1a0e4fe

Browse files
authored
Merge branch 'main' into post/sloan-sustainability-grant
2 parents 42917f4 + 6c95d81 commit 1a0e4fe

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ If you push without running pre-commit locally, the `pre-commit.ci` bot will che
148148

149149
## CI and deployment
150150

151-
The site is deployed to [GitHub Pages](https://pages.github.com) via GitHub Actions.
151+
The site's production build is deployed to [GitHub Pages](https://pages.github.com) via GitHub Actions.
152152

153-
**On push to `main`:** the site is built, checked (linkinator + pa11y-ci), and deployed to the `gh-pages` branch.
153+
**On push to `main`:** `.github/workflows/deploy.yml` builds the site with `make html` and publishes it to the `UC-OSPO-Network.github.io` repo (also on a 12-hour schedule, to keep the aggregated event feeds current).
154154

155-
**On pull requests:** the same build and checks run. Branch PRs also get a deploy preview at `ucospo.net/pr-preview/pr-<number>/` (fork PRs get the build check but not the preview).
155+
**On pull requests:** `.github/workflows/pr.yml` runs the build and checks (linkinator + pa11y-ci). Branch PRs also get a **Netlify deploy preview** (built from `netlify.toml`, linked from the PR's checks); fork PRs get the build check but not the preview. The Netlify preview is not production.
156156

157157
CI checks that run on every PR:
158158

netlify.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
[build.environment]
22
NODE_VERSION = "20"
3+
# pa11y-ci pulls in puppeteer, whose Chrome download is unreliable and breaks
4+
# `npm ci` on Netlify's build cache. The Netlify build never runs puppeteer
5+
# (myst + feed + events + linkinator only), so skip the download. Mirrors the
6+
# PUPPETEER_SKIP_DOWNLOAD fix applied to the GitHub Actions workflows in #342.
7+
PUPPETEER_SKIP_DOWNLOAD = "true"
38

49
[build]
510
publish = "_build/html"

0 commit comments

Comments
 (0)