Skip to content

Commit fc66ff5

Browse files
committed
Try using the visual studio generator on Windows
Maybe the devenv step isn't setting up the environment correctly?
1 parent c83c10d commit fc66ff5

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,31 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [
13-
windows-2019, # 2022's installation is broken for C++ modules
1413
windows-latest,
1514
# macos-latest, # cppfront is currently broken on AppleClang
1615
ubuntu-latest,
1716
]
17+
include:
18+
- os: windows-latest
19+
gen: Visual Studio 17 2022
20+
flags: /experimental:module
21+
- os: ubuntu-latest
22+
gen: Ninja
23+
flags: ""
24+
env:
25+
CMAKE_GENERATOR: ${{ matrix.gen }}
26+
CXXFLAGS: ${{ matrix.flags }}
1827
runs-on: ${{ matrix.os }}
1928
steps:
2029
# System set-up
2130
- uses: actions/checkout@v3
2231
with:
2332
submodules: true
24-
- uses: ilammy/[email protected]
33+
2534
- uses: lukka/get-cmake@latest
2635

2736
- name: Install GCC 11
28-
if: startsWith(matrix.os, 'ubuntu')
37+
if: runner.os == 'Linux'
2938
run: |
3039
sudo apt-get update
3140
sudo apt-get install -y gcc-11 g++-11
@@ -34,7 +43,7 @@ jobs:
3443
3544
# Main cppfront library
3645
- name: Configure cppfront
37-
run: cmake -G Ninja -S . -B build/cppfront -DCMAKE_BUILD_TYPE=Release
46+
run: cmake -S . -B build/cppfront -DCMAKE_BUILD_TYPE=Release
3847
- name: Build cppfront
3948
run: cmake --build build/cppfront --config Release
4049
- name: Install cppfront locally
@@ -43,7 +52,7 @@ jobs:
4352
# Regression tests
4453
- name: Configure regression tests
4554
run: >
46-
cmake -G Ninja -S regression-tests -B build/regression-tests -DCMAKE_BUILD_TYPE=Release
55+
cmake -S regression-tests -B build/regression-tests -DCMAKE_BUILD_TYPE=Release
4756
"-DCMAKE_PREFIX_PATH=${{github.workspace}}/_local"
4857
- name: Build regression tests
4958
run: cmake --build build/regression-tests --config Release
@@ -54,7 +63,7 @@ jobs:
5463
# Example
5564
- name: Configure example
5665
run: >
57-
cmake -G Ninja -S example -B build/example -DCMAKE_BUILD_TYPE=Release
66+
cmake -S example -B build/example -DCMAKE_BUILD_TYPE=Release
5867
"-DCMAKE_PREFIX_PATH=${{github.workspace}}/_local"
5968
- name: Build example
6069
run: cmake --build build/example --config Release

0 commit comments

Comments
 (0)