Update workflows: fix gh calls, general logic improvements

Author: froggleston

.github/workflows/docker_apply_cache.yaml

@@ -35,7 +35,7 @@ jobs:
     name: "Check If We Need {renv}"
     runs-on: ubuntu-latest
     needs: preflight
-    if: ${{ needs.preflight.outputs.do-apply == 'true' }}
+    if: needs.preflight.outputs.do-apply == 'true'
     permissions:
       id-token: write # OIDC permission required
     outputs:
@@ -55,7 +55,7 @@ jobs:
     name: "No renv cache used"
     runs-on: ubuntu-latest
     needs: check-renv
-    if: ${{ needs.check-renv.outputs.renv-needed != 'true' }}
+    if: needs.check-renv.outputs.renv-needed != 'true'
     steps:
       - name: "No renv cache needed"
         run: echo "No renv cache needed for this lesson"
@@ -64,7 +64,7 @@ jobs:
     name: "renv cache available"
     runs-on: ubuntu-latest
     needs: check-renv
-    if: ${{ needs.check-renv.outputs.renv-cache-available == 'true' }}
+    if: needs.check-renv.outputs.renv-cache-available == 'true'
     steps:
       - name: "renv cache available"
         run: echo "renv cache available for this lesson"
@@ -106,14 +106,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Debugging Info
+      - name: "Debugging Info"
         run: |
           echo "Current Directory: $(pwd)"
           ls -lah /home/rstudio/.workbench
           ls -lah $(pwd)
           Rscript -e 'sessionInfo()'
 
-      - name: Mark Repository as Safe
+      - name: "Mark Repository as Safe"
         run: |
           git config --global --add safe.directory $(pwd)
 
@@ -123,15 +123,15 @@ jobs:
           library(sandpaper)
         shell: Rscript {0}
 
-      - name: Setup Lesson Dependencies
+      - name: "Setup Lesson Dependencies"
         run: |
           Rscript /home/rstudio/.workbench/setup_lesson_deps.R
 
-      - name: Fortify renv Cache
+      - name: "Fortify renv Cache"
         run: |
           Rscript /home/rstudio/.workbench/fortify_renv_cache.R
 
-      - name: Get Container Version Used
+      - name: "Get Container Version Used"
         id: wb-vers
         uses: carpentries/actions/container-version@frog-s3-test-1
         with:
@@ -145,16 +145,16 @@ jobs:
           repo: ${{ github.repository }}
           workflow: ${{ github.workflow }}
 
-      - name: Configure AWS credentials via OIDC
+      - name: "Configure AWS credentials via OIDC"
         id: aws-creds
-        if: ${{ steps.validate-org-workflow.outputs.is_valid == 'true' }}
+        if: steps.validate-org-workflow.outputs.is_valid == 'true'
         uses: aws-actions/configure-aws-credentials@v5.0.0
         with:
           role-to-assume: ${{ secrets.AWS_GH_OIDC_ARN }}
           aws-region: ${{ secrets.AWS_GH_OIDC_REGION }}
           output-credentials: true
 
-      - name: Upload cache object to S3
+      - name: "Upload cache object to S3"
         uses: carpentries/actions-cache@frog-matchedkey-1
         with:
           # insecure: false # optional, use http instead of https. default false
@@ -174,8 +174,7 @@ jobs:
     name: "Trigger Build and Deploy Workflow"
     runs-on: ubuntu-latest
     needs: [check-renv, update-renv-cache]
-    if: |
-      needs.update-renv-cache.outcome == 'success'
+    if: needs.update-renv-cache.outcome == 'success'
     steps:
       - name: "Trigger Build and Deploy Workflow"
         env:

.github/workflows/docker_build_deploy.yaml

@@ -50,13 +50,13 @@ jobs:
         id: build-check
         uses: carpentries/actions/build-preflight@frog-s3-test-1
 
-      - name: Checkout Lesson
-        if: ${{ steps.build-check.outputs.do-build == 'true' }}
+      - name: "Checkout Lesson"
+        if: steps.build-check.outputs.do-build == 'true'
         uses: actions/checkout@v4
 
-      - name: Get container version info
+      - name: "Get container version info"
         id: wb-vers
-        if: ${{ steps.build-check.outputs.do-build == 'true' }}
+        if: steps.build-check.outputs.do-build == 'true'
         uses: carpentries/actions/container-version@frog-s3-test-1
         with:
           WORKBENCH_TAG: ${{ vars.WORKBENCH_TAG }}
@@ -66,7 +66,10 @@ jobs:
     name: "Build Full Site"
     runs-on: ubuntu-latest
     needs: preflight
-    if: always() && ${{ needs.preflight.outputs.do-build == 'true' && needs.preflight.outputs.workbench-update != 'true' }}
+    if: |
+      always() &&
+      needs.preflight.outputs.do-build == 'true' &&
+      needs.preflight.outputs.workbench-update != 'true'
     env:
       RENV_EXISTS: ${{ needs.preflight.outputs.renv-needed }}
       RENV_HASH: ${{ needs.preflight.outputs.renv-cache-hashsum }}
@@ -112,7 +115,7 @@ jobs:
           role-to-assume: ${{ secrets.AWS_GH_OIDC_ARN }}
           aws-region: ${{ secrets.AWS_GH_OIDC_REGION }}
 
-      - name: Run Container and Build Site
+      - name: "Run Container and Build Site"
         id: build-and-deploy
         uses: carpentries/actions/build-and-deploy@frog-s3-test-1
         with:
@@ -122,7 +125,7 @@ jobs:
   update-container-version:
     name: "Update container version used"
     runs-on: ubuntu-latest
-    needs: [preflight, full-build]
+    needs: [preflight]
     permissions:
       contents: write
       pull-requests: write
@@ -131,13 +134,10 @@ jobs:
       needs.preflight.outputs.do-build == 'true' &&
       (
         needs.preflight.outputs.workbench-container-file-exists == 'false' ||
-        (
-          needs.full-build.build-and-deploy.outcome == 'success' &&
-          needs.preflight.outputs.wb-vers != needs.preflight.outputs.last-wb-vers
-        )
+        needs.preflight.outputs.workbench-update == 'true'
       )
     steps:
-      - name: Record container version used
+      - name: "Record container version used"
         uses: carpentries/actions/record-container-version@frog-s3-test-1
         with:
           CONTAINER_VER: ${{ needs.preflight.outputs.wb-vers }}

.github/workflows/docker_pr_receive.yaml

@@ -50,7 +50,7 @@ jobs:
       pr_branch: ${{ env.PR_BRANCH }}
     steps:
       - name: "Auto: Grab PR"
-        if: ${{ github.event_name == 'pull_request' }}
+        if: github.event_name == 'pull_request'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -116,13 +116,14 @@ jobs:
       - test-pr
       - check-renv
     runs-on: ubuntu-latest
-    if: ${{ needs.test-pr.outputs.is_valid == 'true' }}
+    if: needs.test-pr.outputs.is_valid == 'true'
     env:
       CHIVE: ${{ github.workspace }}/site/chive
       PR: ${{ github.workspace }}/site/pr
       GHWMD: ${{ github.workspace }}/site/built
       PR_BRANCH: ${{ needs.test-pr.outputs.pr_branch }}
       PR_NUMBER: ${{ needs.test-pr.outputs.pr_number }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     permissions:
       checks: write
       contents: write
@@ -133,17 +134,17 @@ jobs:
       env:
         WORKBENCH_PROFILE: "ci"
         GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         RENV_PATHS_ROOT: /home/rstudio/lesson/renv
         RENV_PROFILE: "lesson-requirements"
         RENV_CONFIG_EXTERNAL_LIBRARIES: "/usr/local/lib/R/site-library"
       volumes:
         - ${{ github.workspace }}:/home/rstudio/lesson
       options: --cpus 2
+    outputs:
+      workbench-update: ${{ steps.wb-vers.outputs.workbench-update }}
     steps:
-      - name: "Check Out PR Branch"
-        uses: actions/checkout@v4
-        # with:
-        #   ref: ${{ env.PR_BRANCH }}
+      - uses: actions/checkout@v4
 
       - name: "Check Out Staging Branch"
         uses: actions/checkout@v4
@@ -168,23 +169,25 @@ jobs:
 
       - name: Get Container Version Used
         id: wb-vers
-        if: ${{ needs.check-renv.outputs.renv-needed == 'true' }}
+        if: needs.check-renv.outputs.renv-needed == 'true'
         uses: carpentries/actions/container-version@frog-s3-test-1
         with:
           WORKBENCH_TAG: ${{ vars.WORKBENCH_TAG }}
           renv-needed: ${{ needs.check-renv.outputs.renv-needed }}
 
       - name: "Validate Current Org and Workflow"
         id: validate-org-workflow
-        if: ${{ needs.check-renv.outputs.renv-needed == 'true' }}
+        if: needs.check-renv.outputs.renv-needed == 'true'
         uses: carpentries/actions/validate-org-workflow@frog-s3-test-1
         with:
           repo: ${{ github.repository }}
           workflow: ${{ github.workflow }}
 
       - name: Configure AWS credentials via OIDC
         id: aws-creds
-        if: ${{ steps.validate-org-workflow.outputs.is_valid == 'true' && needs.check-renv.outputs.renv-needed == 'true' }}
+        if: |
+          steps.validate-org-workflow.outputs.is_valid == 'true' &&
+          needs.check-renv.outputs.renv-needed == 'true'
         uses: aws-actions/configure-aws-credentials@v5.0.0
         with:
           role-to-assume: ${{ secrets.AWS_GH_OIDC_ARN }}
@@ -194,7 +197,7 @@ jobs:
       - name: Get cache object from S3
         id: s3-cache
         uses: carpentries/actions-cache@frog-matchedkey-1
-        if: ${{ needs.check-renv.outputs.renv-needed == 'true' }}
+        if: needs.check-renv.outputs.renv-needed == 'true'
         with:
           # insecure: false # optional, use http instead of https. default false
           accessKey: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -209,7 +212,9 @@ jobs:
             ${{ github.repository }}/${{ steps.wb-vers.outputs.container-version }}_renv-
 
       - name: "Fortify renv Cache"
-        if: ${{ needs.check-renv.outputs.renv-needed == 'true' && steps.s3-cache.outputs.cache-hit != 'true'}}
+        if: |
+          needs.check-renv.outputs.renv-needed == 'true' &&
+          steps.s3-cache.outputs.cache-hit != 'true'
         run: |
           Rscript /home/rstudio/.workbench/fortify_renv_cache.R
 
@@ -260,12 +265,12 @@ jobs:
         shell: Rscript {0}
 
   pr-checks:
-    name: "Trigger PR Checks"
+    name: "Trigger PR Checks?"
     needs:
       - test-pr
       - build-md-source
     runs-on: ubuntu-latest
-    if: ${{ needs.test-pr.outputs.is_valid == 'true' }}
+    if: needs.test-pr.outputs.is_valid == 'true'
     permissions:
       actions: write
       checks: write
@@ -279,3 +284,24 @@ jobs:
         run: |
           gh workflow run pr-comment.yaml --ref main --field workflow_id=${{ github.run_id }}
         shell: bash
+
+  cache-update:
+    name: "Trigger Update Cache Workflow?"
+    needs:
+      - check-renv
+      - build-md-source
+    runs-on: ubuntu-latest
+    if: |
+      needs.check-renv.outputs.renv-needed == 'true' &&
+      needs.build-md-source.outputs.workbench-update == 'true' &&
+      needs.build-md-source.build-site.outcome == 'success'
+    permissions:
+      actions: write
+      checks: write
+    steps:
+      - name: "Trigger renv rebuild"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh workflow run update-cache.yaml
+        shell: bash