Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
eitsupi committed Apr 29, 2024
2 parents a1376cd + 5dc1383 commit 8a5f5c0
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bakefile-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/[email protected].1
uses: actions/[email protected].4
- name: Run make test
run: make test
4 changes: 2 additions & 2 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
all-versions: ${{ steps.set-json.outputs.all-versions }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- id: set-json
run: |
JSON=build/matrix/latest.json
Expand All @@ -52,7 +52,7 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
bakefile:
- devel.docker-bake.json
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
container:
image: rocker/tidyverse:latest
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Set as safe for following git commands
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: install packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- id: set-matrix
run: |
JSON="build/matrix/latest.json"
Expand All @@ -54,7 +54,7 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/r-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
platforms:
- linux/amd64
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Expose GitHub Runtime
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- install_shiny_server.sh
- install_geospatial.sh
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Expose GitHub Runtime
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
outputs:
tag: ${{ steps.tag-version.outputs.new_tag }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4

- id: set-version
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
needs: create_tag
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Create Release
uses: ncipollo/release-action@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
matrix-main: ${{ steps.set-matrix.outputs.matrix-main }}
matrix-extra: ${{ steps.set-matrix.outputs.matrix-extra }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- id: set-matrix
run: |
CONTENT_MAIN="$(jq -r 'tostring' build/matrix/all.json)"
Expand All @@ -48,7 +48,7 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix-main)}}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Clean up
run: |
docker image prune --all --force
Expand Down Expand Up @@ -125,11 +125,11 @@ jobs:
image: rocker/tidyverse:latest
steps:
- name: Checkout main
uses: actions/[email protected].1
uses: actions/[email protected].4
- name: Set as safe for following git commands
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout wiki
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
repository: "${{ github.repository }}.wiki"
path: reports
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scripts-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- id: set-matrix
run: |
CONTENT=$(jq 'tostring' -r tests/rocker_scripts/matrix.json)
Expand All @@ -37,7 +37,7 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Prepare build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
image: rocker/r-ver
steps:
- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
fetch-depth: 0
- name: build
Expand Down

0 comments on commit 8a5f5c0

Please sign in to comment.