Skip to content

Commit 4f37a6b

Browse files
committed
Try to fix windows and linux CI
1 parent e55e042 commit 4f37a6b

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010

1111
env:
1212
FC: gfortran
13-
GCC_V: 10
13+
GCC_V: 11
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818

1919
- name: Install Dependencies
2020
run: |
@@ -24,9 +24,9 @@ jobs:
2424
- name: Build and Test
2525
run: |
2626
mkdir build
27-
cd build
28-
cmake -Wdev -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug" ..
29-
make -j $(nproc)
27+
cmake -S . -B build -Wdev -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug" ..
28+
cmake --build build make -j $(nproc)
29+
cmake --build -t install -j || echo "installation failed"
3030
ctest --output-on-failure --schedule-random --repeat-until-fail 1 --timeout 200
3131
make install
3232
make uninstall

.github/workflows/win-ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Windows CI
22

33
on: [push, pull_request]
44

@@ -17,15 +17,15 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Install Dependencies
2323
uses: msys2/setup-msys2@v2
2424
with:
2525
update: true
2626
path-type: inherit
2727
install: >-
28-
mingw-w64-x86_64-gcc-fortran mingw-w64-x86_64-gcc mingw-w64-x86_64-wget
28+
mingw-w64-x86_64-gcc-fortran mingw-w64-x86_64-gcc
2929
3030
- name: setup-mpi
3131
id: setup-mpi
@@ -36,6 +36,7 @@ jobs:
3636
- name: MPI info
3737
run: |
3838
echo "${{ steps.setup-mpi.outputs.mpi }}"
39+
set -o verbose
3940
mpiexec -help
4041
type mpiexec
4142
ls "${I_MPI_ROOT}/bin"
@@ -45,13 +46,14 @@ jobs:
4546
mpicc.bat -show
4647
mpifc.bat -version || echo "ifort not installed"
4748
mpicc.bat -version || echo "icc not installed"
49+
set +o verbose
4850
4951
- name: Build and Test
5052
run: |
5153
mkdir build
5254
cmake -Wdev -G "Unix Makefiles" -S . -B build -DCMAKE_INSTALL_PREFIX="${HOME}/apps/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug"
5355
cmake --build build -j
54-
cmake --build -t install -j || echo "installation failed"
56+
cmake --build build -t install -j || echo "installation failed"
5557
cd build
5658
ctest --output-on-failure --schedule-random --repeat-until-fail 1 --timeout 200
5759
cd ..

0 commit comments

Comments
 (0)