Skip to content

Commit 0712e39

Browse files
committed
Run the CMake smoke test on Windows
This would have caught a recent regression.
1 parent 8d3d1d0 commit 0712e39

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
##===----------------------------------------------------------------------===##
2+
##
3+
## This source file is part of the Swift open source project
4+
##
5+
## Copyright (c) 2025 Apple Inc. and the Swift project authors
6+
## Licensed under Apache License v2.0 with Runtime Library Exception
7+
##
8+
## See http://swift.org/LICENSE.txt for license information
9+
## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
10+
##
11+
##===----------------------------------------------------------------------===##
12+
13+
if ($env:INSTALL_CMAKE -eq "1") {
14+
winget install -e --id Kitware.CMake
15+
winget install -e --id Ninja-build.Ninja
16+
}
17+
18+
if ($env:SKIP_ANDROID -eq "1") {
19+
winget install -e --id Google.AndroidStudio
20+
}

.github/workflows/pull_request.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ jobs:
2929
linux_pre_build_command: SKIP_ANDROID=1 INSTALL_CMAKE=1 ./.github/scripts/linux_pre_build.sh
3030
linux_build_command: 'swift package -Xbuild-tools-swiftc -DUSE_PROCESS_SPAWNING_WORKAROUND cmake-smoke-test --disable-sandbox --cmake-path `which cmake` --ninja-path `which ninja` --extra-cmake-arg -DCMAKE_C_COMPILER=`which clang` --extra-cmake-arg -DCMAKE_CXX_COMPILER=`which clang++` --extra-cmake-arg -DCMAKE_Swift_COMPILER=`which swiftc`'
3131
linux_swift_versions: '["nightly-main"]'
32-
windows_swift_versions: '[]'
32+
windows_pre_build_command: 'Invoke-Program powershell -Command "$env:SKIP_ANDROID = ''1''; $env:INSTALL_CMAKE = ''1''; .\.github\scripts\windows_pre_build.ps1"'
33+
windows_swift_versions: '["nightly-main"]'
34+
windows_build_command: 'Invoke-Program swift package -Xbuild-tools-swiftc -DUSE_PROCESS_SPAWNING_WORKAROUND cmake-smoke-test --disable-sandbox --cmake-path (Get-Command cmake).Path --ninja-path (Get-Command ninja).Path --extra-cmake-arg -DCMAKE_C_COMPILER=(Get-Command clang).Path --extra-cmake-arg -DCMAKE_CXX_COMPILER=(Get-Command clang++).Path --extra-cmake-arg -DCMAKE_Swift_COMPILER=(Get-Command swiftc).Path'
35+
3336
soundness:
3437
name: Soundness
3538
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main

0 commit comments

Comments
 (0)