diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index f116d345608..61c2a8c6aea 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,6 +10,7 @@ on: pull_request: branches: - main + - release merge_group: branches: - main @@ -66,7 +67,7 @@ jobs: find . -type f \( -name "*.cmake" -o -name "*.cmake.in" -o -name "CMakeLists.txt" \) | xargs cmake-format --check ccpp-build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: [lint] env: OMPI_ALLOW_RUN_AS_ROOT: 1 @@ -159,7 +160,7 @@ jobs: run: mpirun -np 3 python -m pytest -m "not petsc4py and not adios2" python/test/unit ccpp-build-with-petsc: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm needs: [lint] strategy: matrix: @@ -197,6 +198,7 @@ jobs: pip install -Ccmake.build-type="Developer" --no-build-isolation git+https://github.com/${{ env.basix_repository }}.git@${{ env.basix_ref }} pip install --no-build-isolation git+https://github.com/${{ env.ffcx_repository }}.git@${{ env.ffcx_ref }} + # SuperLU_DIST is not built with PETSc complex64 so cannot force finding it here - name: Configure (C++) working-directory: cpp run: > @@ -273,9 +275,9 @@ jobs: run: python -m pytest -m mpi --num-proc=3 python/demo/test.py - name: Run Python unit tests (serial) - run: python -m pytest -m "petsc4py or adios2" -n=auto --durations=50 python/test/unit/ + run: python -m pytest -n=auto --durations=50 python/test/unit/ - name: Run Python unit tests (MPI, np=3) - run: mpirun -np 3 python -m pytest -m "petsc4py or adios2" python/test/unit/ + run: mpirun -np 3 python -m pytest python/test/unit/ build-and-publish-docs: runs-on: ubuntu-latest