Skip to content

Commit 339662d

Browse files
committed
Align with current state of master
1 parent 18e3d8d commit 339662d

File tree

1 file changed

+48
-67
lines changed

1 file changed

+48
-67
lines changed

.github/workflows/ci_windows.yml

Lines changed: 48 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: CI_windows
22

3-
on: push
3+
on: [push, pull_request]
44

55
env:
6-
CTEST_TIME_TIMEOUT: "5" # some failures hang forever
6+
CTEST_TIME_TIMEOUT: "5" # some failures hang forever
77
CMAKE_GENERATOR: Ninja
88

99
jobs:
@@ -12,77 +12,58 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
include:
16-
[
17-
{ msystem: MSYS, arch: x86_64 },
18-
{ msystem: MINGW64, arch: x86_64 },
19-
{ msystem: MINGW32, arch: i686 },
20-
]
15+
include: [
16+
{ msystem: MINGW64, arch: x86_64 },
17+
{ msystem: MINGW32, arch: i686 }
18+
]
2119
defaults:
2220
run:
2321
shell: msys2 {0}
2422
steps:
25-
- uses: actions/checkout@v2
26-
- name: Setup MinGW native environment
27-
uses: msys2/setup-msys2@v2
28-
if: contains(matrix.msystem, 'MINGW')
29-
with:
30-
msystem: ${{ matrix.msystem }}
31-
update: false
32-
install: >-
33-
git
34-
mingw-w64-${{ matrix.arch }}-gcc
35-
mingw-w64-${{ matrix.arch }}-gcc-fortran
36-
mingw-w64-${{ matrix.arch }}-python
37-
mingw-w64-${{ matrix.arch }}-python-pip
38-
mingw-w64-${{ matrix.arch }}-python-setuptools
39-
mingw-w64-${{ matrix.arch }}-cmake
40-
mingw-w64-${{ matrix.arch }}-ninja
41-
- name: Setup msys POSIX environment
42-
uses: msys2/setup-msys2@v2
43-
if: contains(matrix.msystem, 'MSYS')
44-
with:
45-
msystem: MSYS
46-
update: false
47-
install: >-
48-
git
49-
mingw-w64-x86_64-gcc
50-
mingw-w64-x86_64-gcc-fortran
51-
python
52-
python-pip
53-
cmake
54-
ninja
55-
- run: |
56-
python -m venv venv
57-
source venv/bin/activate
58-
pip install fypp
59-
PATH=$PATH:/mingw64/bin/ cmake \
60-
-Wdev \
61-
-B build \
62-
-DCMAKE_BUILD_TYPE=Debug \
63-
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace" \
64-
-DCMAKE_MAXIMUM_RANK:String=4 \
65-
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
66-
env:
67-
FC: gfortran
68-
CC: gcc
69-
CXX: g++
23+
- uses: actions/checkout@v2
7024

71-
- name: CMake build
72-
run: PATH=$PATH:/mingw64/bin/ cmake --build build --parallel
25+
- name: Setup MinGW native environment
26+
uses: msys2/setup-msys2@v2
27+
with:
28+
msystem: ${{ matrix.msystem }}
29+
update: false
30+
install: >-
31+
git
32+
mingw-w64-${{ matrix.arch }}-gcc
33+
mingw-w64-${{ matrix.arch }}-gcc-fortran
34+
mingw-w64-${{ matrix.arch }}-python
35+
mingw-w64-${{ matrix.arch }}-python-fypp
36+
mingw-w64-${{ matrix.arch }}-cmake
37+
mingw-w64-${{ matrix.arch }}-ninja
7338
74-
- name: catch build fail
75-
run: PATH=$PATH:/mingw64/bin/ cmake --build build --verbose --parallel 1
76-
if: failure()
39+
- run: >-
40+
PATH=$PATH:/mingw64/bin/ cmake
41+
-Wdev
42+
-B build
43+
-DCMAKE_BUILD_TYPE=Debug
44+
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
45+
-DCMAKE_MAXIMUM_RANK:String=4
46+
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
47+
env:
48+
FC: gfortran
49+
CC: gcc
50+
CXX: g++
7751
78-
- name: CTest
79-
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
52+
- name: CMake build
53+
run: PATH=$PATH:/mingw64/bin/ cmake --build build --parallel
8054

81-
- uses: actions/upload-artifact@v1
82-
if: failure()
83-
with:
84-
name: WindowsCMakeTestlog
85-
path: build/Testing/Temporary/LastTest.log
55+
- name: catch build fail
56+
run: PATH=$PATH:/mingw64/bin/ cmake --build build --verbose --parallel 1
57+
if: failure()
8658

87-
- name: Install project
88-
run: PATH=$PATH:/mingw64/bin/ cmake --install build
59+
- name: CTest
60+
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
61+
62+
- uses: actions/upload-artifact@v1
63+
if: failure()
64+
with:
65+
name: WindowsCMakeTestlog
66+
path: build/Testing/Temporary/LastTest.log
67+
68+
- name: Install project
69+
run: PATH=$PATH:/mingw64/bin/ cmake --install build

0 commit comments

Comments
 (0)