Merge branch 'main' into add-robin-riley

Author: LauraLangdon

.circleci/config.yml

@@ -2,10 +2,11 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: cimg/python:3.14
+      - image: cimg/node:25.9.0
     steps:
+      - checkout
       - run:
-          name: Build website
+          name: build_website
           command: make html
       - store_artifacts:
           path: _build/html/

.github/workflows/circleci_redirect.yml

@@ -0,0 +1,27 @@
+name: CircleCI redirect
+
+on: [status]
+
+permissions: read-all
+
+jobs:
+  circleci_artifacts_redirector_job:
+    runs-on: ubuntu-latest
+    # if: "${{ github.event.context == 'ci/circleci: build_website' }}"
+    permissions:
+      statuses: write
+    name: Run CircleCI artifacts redirector
+    steps:
+      - name: GitHub Action step
+        id: step1
+        uses: scientific-python/circleci-artifacts-redirector-action@5d358ff96e96429a5c64a969bb4a574555439f4f # v1.3.1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          api-token: ${{ secrets.CIRCLECI_ARTIFACT_REDIRECTOR_TOKEN }}
+          artifact-path: 0/_build/html
+          circleci-jobs: build_website
+          job-title: Check the rendered docs here!
+#      - name: Check the URL
+#        if: github.event.status != 'pending'
+#        run: |
+#          curl --fail ${{ circleci.steps.step1.outputs.url }} | grep $GITHUB_SHA

.github/workflows/deploy.yml

@@ -16,21 +16,46 @@ concurrency:
 
 jobs:
   build-and-deploy:
+    # Do not attempt to deploy documentation on forks
+    if: github.repository_owner == 'UC-OSPO-Network'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           cache: npm
 
-      - run: make check
+      # To set up a cross-repository deploy key:
+      # 1. Create a key pair:
+      #   `ssh-keygen -t ed25519 -C "ucospo.net_deploy_bot@nomail"`
+      # 2. Add the public key to the UC-OSPO-Network/UC-OSPO-Network.github.io repo
+      #   - Settings -> Deploy keys -> Add new
+      #   - Make sure the key has write permissions
+      # 3. Add private key as a secret to UC-OSPO-Network/ucospo.net repo
+      #   - Settings -> Secrets -> New Repository Secret
+      #   - Make sure the name is the same as below: CI_DEPLOY_KEY
+      - name: Install SSH agent
+        if: github.ref == 'refs/heads/main'
+        uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
+        with:
+          ssh-private-key: ${{ secrets.CI_DEPLOY_KEY }}
+
+      - name: Build website
+        if: github.ref == 'refs/heads/main'
+        run: |
+          export BASE_URL="/uc-ospo-network.github.io"
+          make html
 
-      - uses: peaceiris/actions-gh-pages@v4
+      - name: Deploy website
+        if: github.ref == 'refs/heads/main'
+        uses: JamesIves/github-pages-deploy-action@releases/v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          external_repository: UC-OSPO-Network/UC-OSPO-Network.github.io
-          publish_branch: main
-          publish_dir: _build/html
-          cname: ucospo.net
+          git-config-name: ucospo.net_deploy_bot
+          git-config-email: ucospo.net_deploy_bot@nomail
+          folder: _build/html
+          repository-name: UC-OSPO-Network/uc-OSPO-Network.github.io
+          branch: main
+          target-folder: .
+          ssh-key: true

.github/workflows/pr.yml

@@ -1,4 +1,4 @@
-name: PR Build Check & Preview
+name: PR Build Check
 
 on:
   pull_request:
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-and-preview:
+  build-and-check:
     if: github.event.action != 'closed'
     runs-on: ubuntu-latest
     steps:
@@ -25,18 +25,3 @@ jobs:
           cache: npm
 
       - run: make check
-
-      # continue-on-error because fork PRs don't have write access to push
-      # the preview to gh-pages. The build check above still validates the PR.
-      - uses: rossjrw/pr-preview-action@v1
-        continue-on-error: true
-        with:
-          source-dir: _build/html
-
-  cleanup:
-    if: github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: rossjrw/pr-preview-action@v1

events/uc-open-2026/index.md

@@ -172,6 +172,7 @@ _Thanks to the generosity of our sponsors, UC Open is **free to attend** for all
 * - 10:00–10:50
   - **Panel: Influence of AI on Open Source and Open Scholarship**
 
+    Chaired by Leilani Gilpin (UCSC)\
     Panelists: Fernando Perez (UC Berkeley), Sahiba Chopra (UC Berkeley), Marit MacArthur (UC Davis), Tara Hernandez (MongoDB/UCSC)
 * - 10:50–11:10
   - Break & Networking
@@ -188,7 +189,7 @@ _Thanks to the generosity of our sponsors, UC Open is **free to attend** for all
     - 11:10–11:25 *[The OCUDU Blueprint: A New Paradigm for Collaboration in Open Source Innovation](./talks/ocudu-blueprint.md)*—Ranny Haiby (Linux Foundation)
     - 11:25–11:40 *[Open Science Assistant (OSA): An Easy-to-Onboard AI Chatbot for Open Source Research Projects](./talks/open-science-assistant.md)*—Seyed Yahya Shirazi (UCSD)
     - 11:40–11:55 *[Using Continuous Integration to Ensure Accessible Experiences](./talks/continuous-integration-accessible-experiences.md)*—Michael Ball & Silas Santini (UC Berkeley)
-    - 12:00–12:25 *Facilitated Discussion*
+    - 12:00–12:25 *Facilitated Discussion moderated by Emily Lovell (UCSC)*
 * - 12:25–1:45
   - Lunch & Networking
 
@@ -197,7 +198,7 @@ _Thanks to the generosity of our sponsors, UC Open is **free to attend** for all
   - **Breakout 1: Open Source Tools for Public Benefit**
 
     - 1:45–2:00 *[An Open-Source Ecosystem for Building Weather Driven Agricultural Decision Tools](./talks/weather-driven-agricultural-decision-tools.md)*—Andy Lyons (UC ANR)
-    - 2:00–2:15 *TBA*
+    - 2:00–2:15 *[Developing Environmental Wireless Sensor Networks with TockOS](./talks/environmental-wireless-sensor-networks-tockos.md)*—John Madden, Colleen Josephson, Jack Lin & Alec Levy (UCSC)
     - 2:15–2:30 *[Building Tools for Police Accountability](./talks/building-tools-for-police-accountability.md)*—Tarak Shah (UC Berkeley / BIDS)
     - 2:30–2:45 *Signal, Matrix, and Breaking Up with Big Tech Surveillance*—Robin Riley
     - 2:50–3:15 *Facilitated Discussion moderated by Virginia Scarlett (UCSB)*
@@ -207,7 +208,7 @@ _Thanks to the generosity of our sponsors, UC Open is **free to attend** for all
     - 1:45–2:00 *[Making Jupyter Notebooks Accessible](./talks/making-jupyter-notebooks-accessible.md)*—Balaji Alwar & Chanbin Park (UC Berkeley)
     - 2:00–2:15 *[PeerSky in Academia: Create, Publish, and Share Research Without the Cloud](./talks/peersky-in-academia.md)*—Akhilesh Thite (UCSC)
     - 2:15–2:30 *[TRACE: Open Provenance Infrastructure for AI-Assisted Research](./talks/who-did-the-thinking.md)*—Oliver Muellerklein (UC Berkeley)
-    - 2:30–2:45 *[Developing Environmental Wireless Sensor Networks with TockOS](./talks/environmental-wireless-sensor-networks-tockos.md)*—John Madden, Colleen Josephson, Jack Lin & Alec Levy (UCSC)
+    - 2:30–2:45 *TBA*
     - 2:50–3:15 *Facilitated Discussion moderated by Peter Brantley (UCD)*
 * - 3:20–4:00
   - **Keynote:** Kevin Esterling (UC Riverside)—*[Open Source AI and the Public Sphere: Two Paradoxes](./talks/open-source-ai-public-sphere.md)*