Skip to content

Commit

Permalink
JDBetteridge/fixup CI (#3558)
Browse files Browse the repository at this point in the history
* update checkout and upload to v4

This reverts commit 8e9b151.

* Update more actions

* Update comments
  • Loading branch information
JDBetteridge authored May 9, 2024
1 parent af2c9cc commit d81acab
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ env:
jobs:
build:
name: "Build Firedrake"
# The type of runner that the job will run on
# Run on our self-hosted machines
runs-on: self-hosted
# The docker container to use.
container:
image: firedrakeproject/firedrake-env:latest
strategy:
Expand All @@ -49,7 +48,7 @@ jobs:
COMPLEX: ${{ matrix.complex }}
RDMAV_FORK_SAFE: 1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cleanup
if: ${{ always() }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: self-hosted
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ concurrency:
jobs:
build_docs:
name: Run doc build
# The type of runner that the job will run on
# Run on the Github hosted runner
runs-on: ubuntu-latest
# The docker container to use.
container:
image: firedrakeproject/firedrake-docdeps:latest
# Github hosted runners require running as root user:
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#docker-container-filesystem
options: --user root
volumes:
- ${{ github.workspace }}:/home/firedrake/output
# Steps represent a sequence of tasks that will be executed as
# part of the jobs
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install checkedout Firedrake
run: |
. /home/firedrake/firedrake/bin/activate
Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
cd docs
cp build/latex/Firedrake.pdf build/html/_static/manual.pdf
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
name: github-pages
path: /__w/firedrake/firedrake/docs/build/html
Expand All @@ -76,4 +77,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: "Run linter"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
# #example-error-annotation-on-github-actions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check workflow files
uses: docker://rhysd/actionlint:latest
with:
Expand All @@ -53,7 +53,7 @@ jobs:
env:
HADOLINT_IGNORE: "DL3005,DL3007,DL3008,DL3015,DL3059"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Lint dockerfiles inside hadolint container
run: |
for DOCKERFILE in docker/Dockerfile.*; \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zenodo-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: "Run zenodo canary"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Setup Python
Expand All @@ -27,7 +27,7 @@ jobs:
run: |
python scripts/firedrake-install --test-doi-resolution
- name: Upload log
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: "zenodo-canary"
Expand Down

0 comments on commit d81acab

Please sign in to comment.