From 59c2fc247c623b151c188e10c649e4695d6222c1 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Wed, 9 Oct 2024 13:50:24 -0700 Subject: [PATCH] Update workflows, including concurrency. --- .github/workflows/docbuild.yml | 13 +++++++++---- .github/workflows/docker_pyafq.yml | 2 +- .github/workflows/docker_pyafq_cuda12.yml | 4 ++-- .github/workflows/test.yml | 4 ++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docbuild.yml b/.github/workflows/docbuild.yml index 2cb30025..d001ece0 100644 --- a/.github/workflows/docbuild.yml +++ b/.github/workflows/docbuild.yml @@ -2,6 +2,13 @@ name: Documentation build on: [push, pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: write + jobs: build: runs-on: ubuntu-latest @@ -36,8 +43,6 @@ jobs: path: docs/build/html - name: Publish docs to Github Pages if: startsWith(github.event.ref, 'refs/tags') - uses: JamesIves/github-pages-deploy-action@releases/v3 + uses: JamesIves/github-pages-deploy-action@releases/v4 with: - ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: docs/build/html # The folder the action should deploy. + folder: docs/build/html diff --git a/.github/workflows/docker_pyafq.yml b/.github/workflows/docker_pyafq.yml index 0692f744..a1916250 100644 --- a/.github/workflows/docker_pyafq.yml +++ b/.github/workflows/docker_pyafq.yml @@ -35,7 +35,7 @@ jobs: sh ./gpu_docker/docker-build.sh \ "${GITHUB_REF:10}" "nrdg" "11.4.3-devel-ubuntu20.04" "11" - - name: Login to GHCR + - name: Login to GHCR if: github.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/tags') uses: docker/login-action@v1 with: diff --git a/.github/workflows/docker_pyafq_cuda12.yml b/.github/workflows/docker_pyafq_cuda12.yml index 339a6d33..6cbe4d2c 100644 --- a/.github/workflows/docker_pyafq_cuda12.yml +++ b/.github/workflows/docker_pyafq_cuda12.yml @@ -25,9 +25,9 @@ jobs: sh ./gpu_docker/docker-build.sh \ "${GITHUB_REF:10}" "nrdg" "12.0.1-devel-ubuntu20.04" "12" - - name: Login to GHCR + - name: Login to GHCR if: github.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/tags') - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: nrdg diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 875a0846..9fc86345 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,6 +2,10 @@ name: Test suite on: [push, pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: