Merge branch 'main' into switch-to-mermaid

Author: bielsnohr

.github/workflows/README.md

@@ -208,20 +208,22 @@ jobs:
           restore-keys:
             ${{ github.repository }}/${{ steps.wb-vers.outputs.container-version }}_renv-
 
-  trigger-build-deploy:
-    name: "Trigger Build and Deploy Workflow"
+  record-cache-result:
+    name: "Record Caching Status"
     runs-on: ubuntu-latest
-    needs: update-renv-cache
-    if: |
-      needs.update-renv-cache.result == 'success' ||
-      needs.check-renv.outputs.renv-cache-available == 'true'
+    needs: [check-renv, update-renv-cache]
+    if: always()
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - name: "Record cache result"
 
-      - name: "Trigger Build and Deploy Workflow"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh workflow run docker_build_deploy.yaml --ref main
+          echo "${{ needs.update-renv-cache.result == 'success' || needs.check-renv.outputs.renv-cache-available == 'true' || 'false' }}" > ${{ github.workspace }}/apply-cache-result
         shell: bash
-        continue-on-error: true
+
+      - name: "Upload cache result"
+        uses: actions/upload-artifact@v4
+        with:
+          name: apply-cache-result
+          path: ${{ github.workspace }}/apply-cache-result

.github/workflows/docker_apply_cache.yaml

@@ -9,6 +9,10 @@ on:
       - '.github/workbench-docker-version.txt'
   schedule:
     - cron: '0 0 * * 2'
+  workflow_run:
+    workflows: ["03 Maintain: Apply Package Cache"]
+    types:
+      - completed
   workflow_dispatch:
     inputs:
       name:
@@ -72,7 +76,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: preflight
     if: |
-      always() &&
       needs.preflight.outputs.do-build == 'true' &&
       needs.preflight.outputs.workbench-update != 'true'
     env:

.github/workflows/docker_build_deploy.yaml

@@ -19,7 +19,6 @@ permissions:
   pull-requests: write
 
 jobs:
-
   preflight:
     name: "Preflight: md-outputs exists?"
     runs-on: ubuntu-latest
@@ -49,7 +48,9 @@ jobs:
 
   test-pr:
     name: "Record PR number"
-    if: ${{ github.event.action != 'closed' }} && ${{ needs.preflight.outputs.branch-exists == 'true' }}
+    if: |
+      github.event.action != 'closed' &&
+      needs.preflight.outputs.branch-exists == 'true'
     runs-on: ubuntu-latest
     needs: preflight
     outputs:
@@ -135,6 +136,7 @@ jobs:
       checks: write
       contents: write
       pages: write
+      id-token: write
     container:
       image: ghcr.io/carpentries/workbench-docker:${{ vars.WORKBENCH_TAG || 'latest' }}
       env:
@@ -279,24 +281,3 @@ jobs:
       - name: "Teardown"
         run: sandpaper::reset_site()
         shell: Rscript {0}
-
-  pr-checks:
-    name: "Trigger PR Checks?"
-    needs:
-      - test-pr
-      - build-md-source
-    runs-on: ubuntu-latest
-    if: needs.test-pr.outputs.is_valid == 'true'
-    permissions:
-      actions: write
-      checks: write
-    steps:
-      - name: "Checkout Lesson"
-        uses: actions/checkout@v4
-
-      - name: "Trigger PR Checks"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh workflow run pr-comment.yaml --ref main --field workflow_id=${{ github.run_id }}
-        shell: bash

.github/workflows/docker_pr_receive.yaml

@@ -16,7 +16,7 @@ jobs:
           mkdir -p ./pr
           printf ${{ github.event.number }} > ./pr/NUM
       - name: Upload Diff
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: pr
           path: ./pr

.github/workflows/pr-close-signal.yaml

@@ -1,14 +1,10 @@
 name: "Bot: Comment on the Pull Request"
 description: "Comment on the pull request with the results of the markdown generation"
 on:
-  workflow_dispatch:
-    inputs:
-      workflow_id:
-        required: true
-
-concurrency:
-  group: pr-${{ github.event.workflow_run.pull_requests[0].number }}
-  cancel-in-progress: true
+  workflow_run:
+    workflows: ["Bot: Receive Pull Request"]
+    types:
+      - completed
 
 jobs:
   # Pull requests are valid if:
@@ -18,16 +14,6 @@ jobs:
   test-pr:
     name: "Test if pull request is valid"
     runs-on: ubuntu-latest
-    if: >
-      github.event_name == 'workflow_dispatch' ||
-      (
-        github.event_name == 'workflow_run' &&
-        (
-          github.event.workflow_run.event == 'pull_request' ||
-          github.event.workflow_run.event == 'workflow_dispatch'
-        ) &&
-        github.event.workflow_run.conclusion == 'success'
-      )
     outputs:
       is_valid: ${{ steps.check-pr.outputs.VALID }}
       payload: ${{ steps.check-pr.outputs.payload }}
@@ -38,7 +24,7 @@ jobs:
         id: dl
         uses: carpentries/actions/download-workflow-artifact@main
         with:
-          run: ${{ github.event.workflow_run.id || inputs.workflow_id }}
+          run: ${{ github.event.workflow_run.id }}
           name: 'pr'
 
       - name: "Get PR Number"
@@ -79,11 +65,9 @@ jobs:
 
       - name: "Skip checks for Workbench version file updates"
         if: steps.changed-files.outputs.only_version_file == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          echo "Only workbench-docker-version.txt changed, skipping preflight checks and running cache update"
-          gh workflow run update-cache.yaml --ref main
+          echo "# 🔧 Wait for Next Cache Update #"
+          echo "Only workbench-docker-version.txt changed."
           exit 0
         shell: bash
 
@@ -127,8 +111,8 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: 'Checkout md outputs'
-        uses: actions/checkout@v5
+      - name: "Checkout md outputs"
+        uses: actions/checkout@v4
         with:
           ref: md-outputs
           path: built
@@ -138,7 +122,7 @@ jobs:
         id: dl
         uses: carpentries/actions/download-workflow-artifact@main
         with:
-          run: ${{ github.event.workflow_run.id || inputs.workflow_id }}
+          run: ${{ github.event.workflow_run.id }}
           name: 'built'
 
       - if: steps.dl.outputs.success == 'true'
@@ -177,7 +161,7 @@ jobs:
         id: dl
         uses: carpentries/actions/download-workflow-artifact@main
         with:
-          run: ${{ github.event.workflow_run.id || inputs.workflow_id }}
+          run: ${{ github.event.workflow_run.id }}
           name: 'diff'
 
       - if: steps.dl.outputs.success == 'true'
@@ -210,7 +194,7 @@ jobs:
         id: dl
         uses: carpentries/actions/download-workflow-artifact@main
         with:
-          run: ${{ github.event.workflow_run.id || inputs.workflow_id }}
+          run: ${{ github.event.workflow_run.id }}
           name: 'built'
 
       - name: "Alert if spoofed"