Skip to content

Commit

Permalink
Merge commit '706cd964be2f250604951b25bb06c61fd017a23e' into overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
eitsupi committed Apr 24, 2024
2 parents 1c675db + 706cd96 commit 4dffc92
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 36 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/checkout@v4
uses: actions/checkout@v4.1.1
- name: Run make test
run: make test
12 changes: 6 additions & 6 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- id: set-json
run: |
JSON=build/matrix/latest.json
Expand All @@ -51,22 +51,22 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push Docker images
run: |
BAKE_JSON=bakefiles/${{ matrix.r_version }}.docker-bake.json \
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ jobs:
bakefile:
- devel.docker-bake.json
steps:
- uses: actions/checkout@v4
- uses: docker/login-action@v2
- uses: actions/checkout@v4.1.1
- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push Docker images
run: |
BAKE_JSON=bakefiles/${{ matrix.bakefile }} BAKE_OPTION=--push\ --no-cache make bake-json-group
4 changes: 2 additions & 2 deletions .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/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set as safe for following git commands
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: install packages
Expand All @@ -25,7 +25,7 @@ jobs:
make setup
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
commit-message: Automatic update of container definition files
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Expand Down
10 changes: 5 additions & 5 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/checkout@v4
- uses: actions/checkout@v4.1.1
- id: set-matrix
run: |
JSON="build/matrix/latest.json"
Expand All @@ -54,22 +54,22 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push Docker images
run: |
BAKE_JSON=bakefiles/${{ matrix.r_version }}.extra.docker-bake.json \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0

- name: Lint Code Base
uses: github/super-linter@v5
uses: github/super-linter@v6
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: master
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/r-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
platforms:
- linux/amd64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Expose GitHub Runtime
uses: crazy-max/ghaction-github-runtime@v3
- name: test build
Expand Down Expand Up @@ -72,9 +72,9 @@ jobs:
- install_shiny_server.sh
- install_geospatial.sh
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Expose GitHub Runtime
uses: crazy-max/ghaction-github-runtime@v3
- name: test build
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/checkout@v4
- uses: actions/checkout@v4.1.1

- id: set-version
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
needs: create_tag
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Create Release
uses: ncipollo/release-action@v1
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- id: set-matrix
run: |
CONTENT_MAIN="$(jq -r 'tostring' build/matrix/all.json)"
Expand All @@ -47,7 +47,7 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix-main)}}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Clean up
run: |
docker image prune --all --force
Expand Down Expand Up @@ -102,12 +102,12 @@ jobs:
image: rocker/tidyverse:latest
steps:
- name: Checkout main
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
- name: Set as safe for following git commands
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout wiki
if: github.event_name != 'pull_request'
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
repository: "${{ github.repository }}.wiki"
path: reports
Expand All @@ -128,7 +128,7 @@ jobs:
path: reports
- name: Update wiki
if: github.event_name != 'pull_request'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Automated update
repository: reports
6 changes: 3 additions & 3 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/checkout@v4
- uses: actions/checkout@v4.1.1
- id: set-matrix
run: |
CONTENT=$(jq 'tostring' -r tests/rocker_scripts/matrix.json)
Expand All @@ -37,9 +37,9 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Prepare build
id: prep
run: |
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/checkout@v4
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- name: build
Expand Down

0 comments on commit 4dffc92

Please sign in to comment.