From 3189ca347ae7e0d82c1cbc75747fefa13c61d617 Mon Sep 17 00:00:00 2001
From: "Garth N. Wells" <gnw20@cam.ac.uk>
Date: Thu, 18 Jul 2024 21:39:55 +0800
Subject: [PATCH] More build

---
 .github/workflows/conda-env-oneapi.yml |  4 ++
 .github/workflows/oneapi.yml           | 51 +++++++++-----------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/conda-env-oneapi.yml b/.github/workflows/conda-env-oneapi.yml
index 42b020e3efe..7a1fcbec6d4 100644
--- a/.github/workflows/conda-env-oneapi.yml
+++ b/.github/workflows/conda-env-oneapi.yml
@@ -20,3 +20,7 @@ dependencies:
   - pugixml
   - boost
   - kahip
+  - catch2
+  - pytest
+  - pytest-xdist
+  - matplotlib
\ No newline at end of file
diff --git a/.github/workflows/oneapi.yml b/.github/workflows/oneapi.yml
index ecbd8d23759..a7f6cd0210d 100644
--- a/.github/workflows/oneapi.yml
+++ b/.github/workflows/oneapi.yml
@@ -95,36 +95,21 @@ jobs:
           ctest --output-on-failure -R unittests
           mpiexec -n 2 ctest --output-on-failure -R unittests
 
-    #   - name: Build and run DOLFINx C++ regression tests (serial and MPI (np=2))
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build/demo/ -S cpp/demo/
-    #       cmake --build build/demo
-    #       cd build/demo
-    #       ctest -R demo -R serial
-    #       ctest -R demo -R mpi_2
-
-    #   - name: Build DOLFINx Python interface
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       pip -v install --check-build-dependencies --no-build-isolation --config-settings=cmake.build-type="Developer" python/
-    #   - name: Install Python test dependencies
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       pip install matplotlib pytest pytest-xdist
-    #   - name: Run DOLFINx demos (Python, serial)
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       pytest -v -n=2 -m serial --durations=10 python/demo/test.py
-    #   - name: Run DOLFINx demos (Python, MPI (np=2))
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       pytest -m mpi --num-proc=2 python/demo/test.py
-    #   - name: Run DOLFINx Python unit tests (serial)
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       pytest -n=auto --durations=50 python/test/unit
-    #   - name: Run DOLFINx Python unit tests (MPI, np=2)
-    #     run: |
-    #       . /opt/intel/oneapi/setvars.sh
-    #       mpiexec -n 2 pytest python/test/unit
+      - name: Build and run DOLFINx C++ regression tests (serial and MPI (np=2))
+        run: |
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build/demo/ -S cpp/demo/
+          cmake --build build/demo
+          cd build/demo
+          ctest -R demo -R serial
+          ctest -R demo -R mpi_2
+
+      - name: Build DOLFINx Python interface
+        run: pip -v install --check-build-dependencies --no-build-isolation --config-settings=cmake.build-type="Developer" python/
+      - name: Run DOLFINx demos (Python, serial)
+        run: pytest -v -n=2 -m serial --durations=10 python/demo/test.py
+      - name: Run DOLFINx demos (Python, MPI (np=2))
+        run: pytest -m mpi --num-proc=2 python/demo/test.py
+      - name: Run DOLFINx Python unit tests (serial)
+        run: pytest -n=auto --durations=50 python/test/unit
+      - name: Run DOLFINx Python unit tests (MPI, np=2)
+        run: mpiexec -n 2 pytest python/test/unit