Test Before Install

Make sure we can run tests from the build tree.
BLAST-ImpactX · Jan 4, 2023 · 5205c29 · 5205c29
1 parent 2264fe5
commit 5205c29
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -46,18 +46,17 @@ jobs:
         if(!$?) { Exit $LASTEXITCODE }
         cmake --build build --config RelWithDebInfo --parallel 2
         if(!$?) { Exit $LASTEXITCODE }
+    - name: Test
+      run: |
+        ctest --test-dir build --build-config RelWithDebInfo --output-on-failure -E AMReX
+        if(!$?) { Exit $LASTEXITCODE }
     - name: Install
       run: |
         cmake --build build --config RelWithDebInfo --target install
         if(!$?) { Exit $LASTEXITCODE }
         cmake --build build --config RelWithDebInfo --target pip_install
         if(!$?) { Exit $LASTEXITCODE }
 
-    - name: Test
-      run: |
-        ctest --test-dir build --build-config RelWithDebInfo --output-on-failure -E AMReX
-        if(!$?) { Exit $LASTEXITCODE }
-
   build_win_clang:
     name: Clang w/ OMP w/o MPI
     runs-on: windows-2019
@@ -103,17 +102,17 @@ jobs:
         if errorlevel 1 exit 1
         cmake --build build --config Release --parallel 2
         if errorlevel 1 exit 1
-    - name: Install
+    - name: Test
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64
-        cmake --build build --config Release --target install
-        if errorlevel 1 exit 1
-        cmake --build build --config Release --target pip_install
+        ctest --test-dir build --build-config Release --output-on-failure -E AMReX
         if errorlevel 1 exit 1
-    - name: Test
+    - name: Install
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64
-        ctest --test-dir build --build-config Release --output-on-failure -E AMReX
+        cmake --build build --config Release --target install
+        if errorlevel 1 exit 1
+        cmake --build build --config Release --target pip_install
         if errorlevel 1 exit 1
diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake
@@ -76,7 +76,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON)
 set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
     CACHE STRING
     "Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)")
-set(ImpactX_pyamrex_branch "4372b5b4d325bc9c8c73ce18013dbe8fc18cfe9f"
+set(ImpactX_pyamrex_branch "f3ba017531e2d1569e63428919632cf908435e56"
     CACHE STRING
     "Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)")