diff --git a/.github/workflows/Intel.yml b/.github/workflows/Intel.yml index 17fca49..8b97957 100644 --- a/.github/workflows/Intel.yml +++ b/.github/workflows/Intel.yml @@ -7,6 +7,11 @@ on: branches: - develop +# Cancel in-progress workflows when pushing to a branch +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + # Use custom shell with -l so .bash_profile is sourced which loads intel/oneapi/setvars.sh # without having to do it in manually every step defaults: @@ -31,7 +36,7 @@ jobs: rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update - sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + sudo apt-get install intel-oneapi-openmp intel-oneapi-compiler-fortran-2023.2.1 intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2023.2.1 echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile - name: checkout diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index d1e3fe3..93dc5a6 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -7,6 +7,11 @@ on: branches: - develop +# Cancel in-progress workflows when pushing to a branch +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Linux: runs-on: ubuntu-latest diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 7b00d6c..aaf10f8 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -7,6 +7,11 @@ on: branches: - develop +# Cancel in-progress workflows when pushing to a branch +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: MacOS: runs-on: macos-latest diff --git a/.github/workflows/Spack.yml b/.github/workflows/Spack.yml index 367874c..8c3f7bb 100644 --- a/.github/workflows/Spack.yml +++ b/.github/workflows/Spack.yml @@ -15,6 +15,11 @@ on: branches: - develop +# Cancel in-progress workflows when pushing to a branch +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: # This job builds with Spack using every combination of variants and runs the CTest suite each time Spack: diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index c09e498..38f55bf 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -7,6 +7,11 @@ on: branches: - develop +# Cancel in-progress workflows when pushing to a branch +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: developer: runs-on: ubuntu-latest