From 9de9b90978a208ecc31ab2e99b049ea9067b637f Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Tue, 31 Dec 2019 12:06:46 -0500 Subject: [PATCH 1/5] ci: add windows workflow It can be advantageous to have distinct workflows on a per-operating system basis, to quickly see the scope of a failure --- .github/workflows/ci_windows.yml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/ci_windows.yml diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml new file mode 100644 index 000000000..cdcab0a3a --- /dev/null +++ b/.github/workflows/ci_windows.yml @@ -0,0 +1,37 @@ +name: CI_windows + +on: [push, pull_request] + +env: + CI: "ON" + +jobs: + Build: + runs-on: windows-latest + strategy: + fail-fast: false + + steps: + - uses: actions/checkout@v1 + + - run: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -Wdev -B build + env: + FC: gfortran + CC: gcc + CXX: g++ + + - name: CMake build + run: cmake --build build --parallel + + - run: cmake --build build --verbose --parallel 1 + if: failure() + + - name: CTest + run: ctest --parallel -V + working-directory: build + + - uses: actions/upload-artifact@v1 + if: failure() + with: + name: WindowsCMakeTestlog + path: build/Testing/Temporary/LastTest.log \ No newline at end of file From 21bba9f2cf2d677b73ac11186e214a4ad550bbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 31 Dec 2019 16:32:27 -0700 Subject: [PATCH 2/5] CTest: make it output on error --- .github/workflows/ci_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index cdcab0a3a..7c138a7ae 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -27,7 +27,7 @@ jobs: if: failure() - name: CTest - run: ctest --parallel -V + run: ctest --output-on-failure --parallel -V working-directory: build - uses: actions/upload-artifact@v1 From 0c827d9a1baec33089abab0b09b6dfcb7d5bc13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Tue, 31 Dec 2019 16:45:11 -0700 Subject: [PATCH 3/5] Compile in Debug mode --- .github/workflows/ci_windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 7c138a7ae..d2b943aaa 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -14,7 +14,8 @@ jobs: steps: - uses: actions/checkout@v1 - - run: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -Wdev -B build + - run: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -Wdev -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace" + env: FC: gfortran CC: gcc From 815d23a2f790027d5d8fba0e248c0bfbb56a25dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 2 Jan 2020 09:24:06 -0700 Subject: [PATCH 4/5] Disable quadruple precision for now --- src/tests/loadtxt/test_loadtxt.f90 | 6 +++--- src/tests/loadtxt/test_savetxt.f90 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/loadtxt/test_loadtxt.f90 b/src/tests/loadtxt/test_loadtxt.f90 index 1d07c5e13..4caee4008 100644 --- a/src/tests/loadtxt/test_loadtxt.f90 +++ b/src/tests/loadtxt/test_loadtxt.f90 @@ -5,7 +5,7 @@ program test_loadtxt real(sp), allocatable :: s(:, :) real(dp), allocatable :: d(:, :) -real(qp), allocatable :: q(:, :) +!real(qp), allocatable :: q(:, :) call loadtxt("array1.dat", s) call print_array(s) @@ -22,8 +22,8 @@ program test_loadtxt call loadtxt("array4.dat", d) call print_array(d) -call loadtxt("array4.dat", q) -call print_array(q) +!call loadtxt("array4.dat", q) +!call print_array(q) contains diff --git a/src/tests/loadtxt/test_savetxt.f90 b/src/tests/loadtxt/test_savetxt.f90 index 1033e6534..172c52b6b 100644 --- a/src/tests/loadtxt/test_savetxt.f90 +++ b/src/tests/loadtxt/test_savetxt.f90 @@ -10,7 +10,7 @@ program test_loadtxt call test_sp(outpath) call test_dp(outpath) -call test_qp(outpath) +!call test_qp(outpath) contains From 6b4d861bced69ecfe806a0d801965e18b8a70576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 2 Jan 2020 09:29:55 -0700 Subject: [PATCH 5/5] Add a new line at the end of the file --- .github/workflows/ci_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index d2b943aaa..9b0f856bd 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -35,4 +35,4 @@ jobs: if: failure() with: name: WindowsCMakeTestlog - path: build/Testing/Temporary/LastTest.log \ No newline at end of file + path: build/Testing/Temporary/LastTest.log