Skip to content

Commit fdcc066

Browse files
Update build.yml
1 parent 8159591 commit fdcc066

1 file changed

Lines changed: 13 additions & 22 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
matrix:
1717
compiler: [g++, clang++]
1818
generator: [Unix Makefiles, Ninja]
19-
continue-on-error: true
2019

2120
steps:
2221
- uses: actions/checkout@v4
@@ -43,27 +42,25 @@ jobs:
4342

4443
- name: Run verification
4544
run: ./build/verify_parallel
46-
continue-on-error: true
4745

4846
windows:
4947
name: Windows Verification
5048
runs-on: windows-latest
5149
strategy:
5250
fail-fast: false
5351
matrix:
54-
compiler: [msvc, clang++, mingw]
52+
compiler: [msvc, clang++, g++]
5553
generator: [Ninja, "Visual Studio 17 2022"]
5654
exclude:
5755
- compiler: clang++
5856
generator: "Visual Studio 17 2022"
59-
- compiler: mingw
57+
- compiler: g++
6058
generator: "Visual Studio 17 2022"
6159
include:
6260
- compiler: clang++
6361
generator: "MinGW Makefiles"
64-
- compiler: mingw
62+
- compiler: g++
6563
generator: "MinGW Makefiles"
66-
continue-on-error: true
6764

6865
steps:
6966
- uses: actions/checkout@v4
@@ -72,37 +69,33 @@ jobs:
7269
run: choco install cmake ninja -y
7370

7471
- name: Install MinGW
75-
if: matrix.compiler == 'mingw'
72+
if: matrix.compiler == 'g++'
7673
run: choco install mingw -y
7774

78-
- name: Locate MinGW g++
79-
if: matrix.compiler == 'mingw'
80-
run: |
81-
MINGW_GXX="$(where g++ | Select-String -Pattern 'mingw64.*g\+\+.exe' | Select-Object -First 1)"
82-
if (-not $MINGW_GXX) {
83-
Write-Error "g++.exe not found in expected MinGW directories"
84-
exit 1
85-
}
86-
echo "CXX=$MINGW_GXX" >> $env:GITHUB_ENV
87-
shell: pwsh
88-
8975
- name: Set up MSVC environment
9076
if: matrix.compiler == 'msvc'
9177
uses: ilammy/msvc-dev-cmd@v1
78+
79+
- name: Set up compiler path
80+
run:
81+
if [ "${{ matrix.compiler }}" = "msvc" ]; then
82+
echo "CXX=cl" >> $GITHUB_ENV
83+
else
84+
echo "CXX=${{ matrix.compiler }}" >> $GITHUB_ENV
85+
fi
9286

9387
- name: Configure CMake
9488
run: >
9589
cmake -S . -B build
9690
-G "${{ matrix.generator }}"
97-
-DCMAKE_CXX_COMPILER=$CXX
91+
-DCMAKE_CXX_COMPILER="$env:CXX"
9892
shell: bash
9993

10094
- name: Build
10195
run: cmake --build build --config Release
10296

10397
- name: Run verification
10498
run: ./build/Release/verify_parallel.exe
105-
continue-on-error: true
10699

107100
macos:
108101
name: macOS Verification
@@ -112,7 +105,6 @@ jobs:
112105
matrix:
113106
compiler: [clang++, g++-13]
114107
generator: [Unix Makefiles, Ninja]
115-
continue-on-error: true
116108

117109
steps:
118110
- uses: actions/checkout@v4
@@ -140,4 +132,3 @@ jobs:
140132

141133
- name: Run verification
142134
run: ./build/verify_parallel
143-
continue-on-error: true

0 commit comments

Comments
 (0)