@@ -25,57 +25,34 @@ jobs:
2525 fail-fast : false
2626 matrix :
2727 compiler : [
28- # { name: 'Visual Studio 2017', ver: 15.8.0.0 },
29- # { name: 'Visual Studio 2017', ver: 15.9.20.0 },
30- # { name: 'Visual Studio 2017', ver: 15.9.40.0 },
31- # { name: 'Visual Studio 2017', ver: 15.9.55.0 },
32- { name: 'Visual Studio 2017', ver: 15.9.64 },
33- # { name: 'Visual Studio 2019', ver: 16.0.0.0 },
34- # { name: 'Visual Studio 2019', ver: 16.4.0.0 },
35- # { name: 'Visual Studio 2019', ver: 16.8.0.0 },
36- # { name: 'Visual Studio 2019', ver: 16.10.0.0 },
37- { name: 'Visual Studio 2019', ver: 16.11.38 },
38- # { name: 'Visual Studio 2022', ver: 117.0.0.0 },
39- # { name: 'Visual Studio 2022', ver: 117.4.0.0 },
40- # { name: 'Visual Studio 2022', ver: 117.8.0.0 },
41- # { name: 'Visual Studio 2022', ver: 117.9.0.0 },
42- { name: 'Visual Studio 2022', ver: 117.10.5 },
43- # { name: MinGW, ver: 7.5.0 },
44- # { name: MinGW, ver: 8.5.0 },
45- # { name: MinGW, ver: 9.4.0 },
46- # { name: MinGW, ver: 10.3.0 },
47- # { name: MinGW, ver: 11.2.0 },
48- # { name: MinGW, ver: 12.2.0 },
28+ { name: MSVC, ver: 141 },
29+ { name: MSVC, ver: 142 },
30+ { name: MSVC, ver: 143 },
31+ { name: MinGW, ver: 7.5.0 },
32+ { name: MinGW, ver: 8.5.0 },
33+ { name: MinGW, ver: 9.4.0 },
34+ { name: MinGW, ver: 10.3.0 },
35+ { name: MinGW, ver: 11.2.0 },
36+ { name: MinGW, ver: 12.2.0 },
4937 { name: MinGW, ver: 13.2.0 },
50- # { name: Clang, ver: 11.1.0 },
51- # { name: Clang, ver: 12.0.1 },
52- # { name: Clang, ver: 13.0.1 },
53- # { name: Clang, ver: 14.0.6 },
54- # { name: Clang, ver: 15.0.7 },
55- # { name: Clang, ver: 16.0.6 },
56- # { name: Clang, ver: 17.0.6 },
57- # { name: Clang, ver: 18.1.2 },
38+ { name: Clang, ver: 11.1.0 },
39+ { name: Clang, ver: 12.0.1 },
40+ { name: Clang, ver: 13.0.1 },
41+ { name: Clang, ver: 14.0.6 },
42+ { name: Clang, ver: 15.0.7 },
43+ { name: Clang, ver: 16.0.6 },
44+ { name: Clang, ver: 17.0.6 },
45+ { name: Clang, ver: 18.1.2 },
5846 { name: Clang, ver: 18.1.8 } ]
5947 build_type : [ Release ]
6048 os : [ windows-2019, windows-2022 ]
6149 std : [ 17, 20, 23 ]
6250 library_type : [ Static ]
6351 include :
64- - compiler : { name: 'Visual Studio 2017' }
52+ - compiler : { name: MSVC }
6553 cxx : ' '
6654 cc : ' '
67- package : visualstudio2017community
68- generator : ' Visual Studio 15 2017'
69- - compiler : { name: 'Visual Studio 2019' }
70- cxx : ' '
71- cc : ' '
72- package : visualstudio2019community
73- generator : ' Visual Studio 16 2019'
74- - compiler : { name: 'Visual Studio 2022' }
75- cxx : ' '
76- cc : ' '
77- package : visualstudio2022community
78- generator : ' Visual Studio 17 2022'
55+ generator : ' '
7956 - compiler : { name: MinGW }
8057 cxx : g++
8158 cc : gcc
@@ -92,19 +69,21 @@ jobs:
9269 - uses : actions/checkout@v4
9370
9471 - name : Create Build Environment
72+ if : matrix.compiler.tool != 'MSVC'
9573 shell : bash
9674 run : choco install ${{matrix.package}} --version ${{matrix.compiler.ver}} --allow-downgrade -y && choco install ninja && cmake -E make_directory ${{runner.workspace}}/build
9775
9876 - name : Try Setup MinGW Environment
9977 if : matrix.compiler.name == 'MinGW'
10078 shell : bash
10179 run : |
102- echo "PATH=${{env.CHOCO_MINGW_BIN_DIR}}: ${PATH}" >> $GITHUB_ENV
80+ echo "PATH=${{env.CHOCO_MINGW_BIN_DIR}}; ${PATH}" >> $GITHUB_ENV
10381
10482 - name : Configure
10583 env :
10684 CXX : ${{matrix.cxx}}
10785 CC : ${{matrix.cc}}
86+ PARAMETERS : ${{ matrix.compiler.tool == 'MSVC' && format('-A x64 -T v{0}', matrix.compiler.ver) || format('-G "{0}"', matrix.generator) }}
10887 run : cmake -B ${{runner.workspace}}/build -G "${{matrix.generator}}" ${{env.PARAMETERS}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
10988
11089 - name : Build
0 commit comments