Try to fix windows and linux CI

sourceryinstitute · Jan 12, 2024 · 4f37a6b · 4f37a6b
1 parent e55e042
commit 4f37a6b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,11 +10,11 @@ jobs:
 
     env:
       FC: gfortran
-      GCC_V: 10
+      GCC_V: 11
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Dependencies
       run: |
@@ -24,9 +24,9 @@ jobs:
     - name: Build and Test
       run: |
         mkdir build
-        cd build
-        cmake -Wdev -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug" ..
-        make -j $(nproc)
+        cmake -S . -B build -Wdev -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug" ..
+        cmake --build build make -j $(nproc)
+        cmake --build -t install -j || echo "installation failed"
         ctest --output-on-failure --schedule-random --repeat-until-fail 1 --timeout 200
         make install
         make uninstall
diff --git a/.github/workflows/win-ci.yml b/.github/workflows/win-ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Windows CI
 
 on: [push, pull_request]
 
@@ -17,15 +17,15 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Dependencies
       uses: msys2/setup-msys2@v2
       with:
         update: true
         path-type: inherit
         install: >-
-          mingw-w64-x86_64-gcc-fortran mingw-w64-x86_64-gcc mingw-w64-x86_64-wget
+          mingw-w64-x86_64-gcc-fortran mingw-w64-x86_64-gcc
 
     - name: setup-mpi
       id: setup-mpi
@@ -36,6 +36,7 @@ jobs:
     - name: MPI info
       run: |
         echo "${{ steps.setup-mpi.outputs.mpi }}"
+        set -o verbose
         mpiexec -help
         type mpiexec
         ls "${I_MPI_ROOT}/bin"
@@ -45,13 +46,14 @@ jobs:
         mpicc.bat -show
         mpifc.bat -version || echo "ifort not installed"
         mpicc.bat -version || echo "icc not installed"
+        set +o verbose
 
     - name: Build and Test
       run: |
         mkdir build
         cmake -Wdev -G "Unix Makefiles" -S . -B build -DCMAKE_INSTALL_PREFIX="${HOME}/apps/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug"
         cmake --build build -j
-        cmake --build -t install -j || echo "installation failed"
+        cmake --build build -t install -j || echo "installation failed"
         cd build
         ctest --output-on-failure --schedule-random --repeat-until-fail 1 --timeout 200
         cd ..