Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
280 changes: 114 additions & 166 deletions .github/workflows/README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .github/workflows/docker_apply_cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
- ${{ github.workspace }}:/home/rstudio/lesson
options: --cpus 2
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: "Debugging Info"
run: |
Expand Down Expand Up @@ -187,15 +187,15 @@ jobs:
steps.validate-org-workflow.outputs.is_valid == 'true' &&
env.role-to-assume != '' &&
env.aws-region != ''
uses: aws-actions/configure-aws-credentials@v5.0.0
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: ${{ env.role-to-assume }}
aws-region: ${{ env.aws-region }}
output-credentials: true

- name: "Upload cache object to S3"
id: upload-cache
uses: carpentries/actions-cache@frog-matchedkey-1
uses: tespkg/actions-cache@v1.10.0
with:
accessKey: ${{ steps.aws-creds.outputs.aws-access-key-id }}
secretKey: ${{ steps.aws-creds.outputs.aws-secret-access-key }}
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
shell: bash

- name: "Upload cache result"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: apply-cache-result
path: ${{ github.workspace }}/apply-cache-result
6 changes: 4 additions & 2 deletions .github/workflows/docker_build_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 'main'
- 'l10n_main'
paths-ignore:
- '.github/workflows/**.yaml'
- '.github/workbench-docker-version.txt'
Expand Down Expand Up @@ -60,7 +61,7 @@ jobs:

- name: "Checkout Lesson"
if: steps.build-check.outputs.do-build == 'true'
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Get container version info"
id: wb-vers
Expand Down Expand Up @@ -98,7 +99,7 @@ jobs:
- ${{ github.workspace }}:/home/rstudio/lesson
options: --cpus 1
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: "Debugging Info"
run: |
Expand Down Expand Up @@ -132,6 +133,7 @@ jobs:
with:
reset: ${{ vars.BUILD_RESET || github.event.inputs.reset || 'false' }}
skip-manage-deps: ${{ github.event.inputs.force-skip-manage-deps == 'true' || steps.build-container-deps.outputs.renv-cache-available || steps.build-container-deps.outputs.backup-cache-used || 'false' }}
lang-code: ${{ vars.LANG_CODE || '' }}

update-container-version:
name: "Update container version used"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/docker_pr_receive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
branch-exists: ${{ steps.check.outputs.exists }}
steps:
- name: "Checkout Lesson"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Check if md-outputs branch exists"
id: check
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
- name: "Upload PR number"
id: upload
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: pr
path: ${{ github.workspace }}/NR
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
renv-cache-hashsum: ${{ steps.renv-check.outputs.renv-cache-hashsum }}
steps:
- name: "Checkout Lesson"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Is renv required?"
id: renv-check
Expand Down Expand Up @@ -153,10 +153,10 @@ jobs:
workbench-update: ${{ steps.wb-vers.outputs.workbench-update }}
build-site: ${{ steps.build-site.outcome }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: "Check Out Staging Branch"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: md-outputs
path: ${{ env.GHWMD }}
Expand Down Expand Up @@ -205,15 +205,15 @@ jobs:
needs.check-renv.outputs.renv-needed == 'true' &&
env.role-to-assume != '' &&
env.aws-region != ''
uses: aws-actions/configure-aws-credentials@v5.0.0
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: ${{ env.role-to-assume }}
aws-region: ${{ env.aws-region }}
output-credentials: true

- name: Get cache object from S3
id: s3-cache
uses: carpentries/actions-cache/restore@frog-matchedkey-1
uses: tespkg/actions-cache/restore@v1.10.0
if: needs.check-renv.outputs.renv-needed == 'true'
with:
# insecure: false # optional, use http instead of https. default false
Expand Down Expand Up @@ -258,21 +258,21 @@ jobs:
shell: Rscript {0}

- name: "Upload PR"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: pr
path: ${{ env.PR }}
overwrite: true

- name: "Upload Diff"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: diff
path: ${{ env.CHIVE }}
retention-days: 1

- name: "Upload Build"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: built
path: ${{ env.GHWMD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-close-signal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
mkdir -p ./pr
printf ${{ github.event.number }} > ./pr/NUM
- name: Upload Diff
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: pr
path: ./pr
4 changes: 2 additions & 2 deletions .github/workflows/pr-comment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
exit 1

- name: "Checkout Lesson"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Verify committed files"
id: changed-files
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
contents: write
steps:
- name: "Checkout md outputs"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: md-outputs
path: built
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/sandpaper-version.txt

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/update-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
renv-needed: ${{ steps.renv-check.outputs.renv-needed }}
steps:
- name: "Checkout Lesson"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Is renv required?"
id: renv-check
Expand All @@ -89,7 +89,7 @@ jobs:
RENV_PATHS_ROOT: ~/.local/share/renv/
steps:
- name: "Checkout Lesson"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Set up R"
uses: r-lib/actions/setup-r@v2
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
steps.validate-org-workflow.outputs.is_valid == 'true' &&
env.role-to-assume != '' &&
env.aws-region != ''
uses: aws-actions/configure-aws-credentials@v5.0.0
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: ${{ env.role-to-assume }}
aws-region: ${{ env.aws-region }}
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/update-workflows.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: "04 Maintain: Update Workflow Files"
description: "Update workflow files from the carpentries/sandpaper repository"

on:
schedule:
- cron: '0 0 * * 2'
Expand All @@ -9,10 +10,10 @@ on:
description: 'Who triggered this build (enter github username to tag yourself)?'
required: true
default: 'weekly run'
tarball:
description: 'Absolute URL to the desired sandpaper repo tarball'
version:
description: 'Workflows version number (e.g. 0.0.1), branch name (e.g. main), or "latest"'
required: false
default: ''
default: 'latest'
clean:
description: 'Workflow files/file extensions to clean (no wildcards, enter "" for none)'
required: false
Expand All @@ -28,7 +29,7 @@ jobs:
id-token: write
steps:
- name: "Checkout Repository"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Validate Current Org and Workflow"
id: validate-org-workflow
Expand All @@ -45,7 +46,7 @@ jobs:
steps.validate-org-workflow.outputs.is_valid == 'true' &&
env.role-to-assume != '' &&
env.aws-region != ''
uses: aws-actions/configure-aws-credentials@v5.0.0
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: ${{ env.role-to-assume }}
aws-region: ${{ env.aws-region }}
Expand Down Expand Up @@ -88,7 +89,7 @@ jobs:
if: ${{ steps.validate-token.outputs.wf == 'true' }}
uses: carpentries/actions/update-workflows@main
with:
repo: ${{ github.event.inputs.tarball || 'https://carpentries.r-universe.dev' }}
version: ${{ github.event.inputs.version || 'latest' }}
clean: ${{ github.event.inputs.clean || '.yaml' }}

- name: Create Pull Request
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/workflows-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.1