Update workflows

Author: froggleston

.github/workflows/docker_pr_receive.yaml

@@ -205,7 +205,7 @@ jobs:
           env.aws-region != ''
         uses: aws-actions/configure-aws-credentials@v5.0.0
         with:
-          role-to-assume: ${{ env.role-to-assumeN }}
+          role-to-assume: ${{ env.role-to-assume }}
           aws-region: ${{ env.aws-region }}
           output-credentials: true
 

.github/workflows/pr-comment.yaml

@@ -64,7 +64,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ## Get list of changed files in the PR ##
-          ONLY_VERSION=$(gh pr view 10 --json files --jq '
+          ONLY_VERSION=$(gh pr view ${{ steps.get-pr.outputs.NUM }} --json files --jq '
             .files |
             length == 1 and
             .[0].path == ".github/workbench-docker-version.txt"

.github/workflows/update-cache.yaml

@@ -7,8 +7,8 @@ on:
         description: 'Who triggered this build?'
         required: true
         default: 'Maintainer (via GitHub)'
-      skip-restore:
-        description: 'Force lockfile update?'
+      force-renv-init:
+        description: 'Force full lockfile update?'
         required: false
         default: false
         type: boolean
@@ -27,9 +27,9 @@ on:
     - cron: '0 0 * * 2'
 
 env:
-  LOCKFILE_CACHE_GEN: ${{ github.event.inputs.generate-cache || 'false' }}
-  SKIP_RENV_RESTORE: ${{ github.event.inputs.skip-restore || 'false' }}
-  UPDATE_PACKAGES: ${{ github.event.inputs.update-packages || 'true' }}
+  LOCKFILE_CACHE_GEN: ${{ vars.LOCKFILE_CACHE_GEN || github.event.inputs.generate-cache || 'false' }}
+  FORCE_RENV_INIT: ${{ vars.FORCE_RENV_INIT || github.event.inputs.force-renv-init || 'false' }}
+  UPDATE_PACKAGES: ${{ vars.UPDATE_PACKAGES || github.event.inputs.update-packages || 'true' }}
 
 jobs:
   preflight:
@@ -100,10 +100,10 @@ jobs:
 
       - name: "Update {renv} deps and determine if a PR is needed"
         id: update
-        uses: carpentries/actions/update-lockfile@main
+        uses: carpentries/actions/update-lockfile@frog-s3-test-1
         with:
           update: ${{ env.UPDATE_PACKAGES }}
-          skip-restore: ${{ env.SKIP_RENV_RESTORE }}
+          force-renv-init: ${{ env.FORCE_RENV_INIT }}
           generate-cache: ${{ env.LOCKFILE_CACHE_GEN }}
           cache-version: ${{ secrets.CACHE_VERSION }}
 
@@ -207,7 +207,7 @@ jobs:
       - name: "Trigger checks"
         if: |
           steps.cpr.outputs.pull-request-number != '' &&
-          steps.validate-token.outputs.wf != 'true'
+          steps.validate-org-workflow.outputs.is_valid != 'true'
         run: |
           gh workflow run docker_pr_receive.yaml --field pr_number=${{ steps.cpr.outputs.pull-request-number }}
         shell: bash