Skip to content

Commit d76f383

Browse files
authored
Properly adapt the other workflow runs as well (#6769)
1 parent da58556 commit d76f383

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build-nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@ jobs:
155155
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
156156
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
157157
-DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
158-
-G "Visual Studio 16 2019" -T "v142" ..
158+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
159159
else
160160
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
161161
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
162162
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
163163
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
164-
-G "Visual Studio 16 2019" -T "v142" ..
164+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
165165
fi
166166
- name: Compile
167167
working-directory: ./build

.github/workflows/build-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,13 @@ jobs:
211211
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
212212
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
213213
-DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
214-
-G "Visual Studio 16 2019" -T "v142" ..
214+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
215215
else
216216
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
217217
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
218218
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
219219
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
220-
-G "Visual Studio 16 2019" -T "v142" ..
220+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
221221
fi
222222
- name: Compile
223223
working-directory: ./build

.github/workflows/build-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ jobs:
153153
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
154154
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
155155
-DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
156-
-G "Visual Studio 16 2019" -T "v142" ..
156+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
157157
else
158158
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
159159
-DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
160160
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
161161
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
162-
-G "Visual Studio 16 2019" -T "v142" ..
162+
-G "Visual Studio 17 2022" -T "v143" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
163163
fi
164164
- name: Compile
165165
working-directory: ./build

0 commit comments

Comments
 (0)