Setup a basic run of cmake-smoke-test in CI

Author: owenv

.github/workflows/pull_request.yml

@@ -45,6 +45,21 @@ jobs:
       linux_swift_versions: '["nightly-main", "nightly-6.2"]'
       windows_swift_versions: '["nightly-main"]'
       windows_build_command: 'swift test --no-parallel'
+  cmake-smoke-test:
+    name: cmake-smoke-test
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    with:
+      linux_os_versions: '["noble"]'
+      linux_pre_build_command: |
+        apt-get update -y
+
+        # Build dependencies
+        apt-get install -y libsqlite3-dev libncurses-dev
+
+        apt-get install -y cmake ninja-build
+      linux_build_command: 'TERM=xterm-256color swift package cmake-smoke-test --disable-sandbox --cmake-path `which cmake` --ninja-path `which ninja`'
+      linux_swift_versions: '["nightly-main"]'
+      windows_swift_versions: '[]'
   soundness:
     name: Soundness
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main

Plugins/cmake-smoke-test/cmake-smoke-test.swift

@@ -16,6 +16,7 @@ import Foundation
 @main
 struct CMakeSmokeTest: CommandPlugin {
     func performCommand(context: PluginContext, arguments: [String]) async throws {
+        print(arguments)
         var args = ArgumentExtractor(arguments)
         let hostOS = try OS.host()
 
@@ -33,6 +34,7 @@ struct CMakeSmokeTest: CommandPlugin {
         if let sysrootPath {
             print("using sysroot at \(sysrootPath)")
         }
+        let extraCMakeArgs = args.extractOption(named: "extra-cmake-arg")
 
         let moduleCachePath = context.pluginWorkDirectoryURL.appending(component: "module-cache").path()
 
@@ -80,38 +82,38 @@ struct CMakeSmokeTest: CommandPlugin {
             "-DCMAKE_MAKE_PROGRAM=\(ninjaPath)",
             "-DCMAKE_BUILD_TYPE:=Debug",
             "-DCMAKE_Swift_FLAGS='\(sharedSwiftFlags.joined(separator: " "))'"
-        ] + cMakeProjectArgs
+        ] + cMakeProjectArgs + extraCMakeArgs
 
         print("Building swift-tools-support-core")
-        try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftToolsSupportCoreURL.path()], workingDirectory: swiftToolsSupportCoreBuildURL)
-        try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftToolsSupportCoreBuildURL)
+        try Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftToolsSupportCoreURL.path()], workingDirectory: swiftToolsSupportCoreBuildURL)
+        try Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftToolsSupportCoreBuildURL)
         print("Built swift-tools-support-core")
 
         if hostOS != .macOS {
             print("Building swift-system")
-            try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftSystemURL.path()], workingDirectory: swiftSystemBuildURL)
-            try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftSystemBuildURL)
+            try Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftSystemURL.path()], workingDirectory: swiftSystemBuildURL)
+            try Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftSystemBuildURL)
             print("Built swift-system")
         }
 
         print("Building llbuild")
-        try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + ["-DLLBUILD_SUPPORT_BINDINGS:=Swift", llbuildURL.path()], workingDirectory: llbuildBuildURL)
-        try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: llbuildBuildURL)
+        try Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + ["-DLLBUILD_SUPPORT_BINDINGS:=Swift", llbuildURL.path()], workingDirectory: llbuildBuildURL)
+        try Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: llbuildBuildURL)
         print("Built llbuild")
 
         print("Building swift-argument-parser")
-        try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + ["-DBUILD_TESTING=NO", "-DBUILD_EXAMPLES=NO", swiftArgumentParserURL.path()], workingDirectory: swiftArgumentParserBuildURL)
-        try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftArgumentParserBuildURL)
+        try Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + ["-DBUILD_TESTING=NO", "-DBUILD_EXAMPLES=NO", swiftArgumentParserURL.path()], workingDirectory: swiftArgumentParserBuildURL)
+        try Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftArgumentParserBuildURL)
         print("Built swift-argument-parser")
 
         print("Building swift-driver")
-        try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftDriverURL.path()], workingDirectory: swiftDriverBuildURL)
-        try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftDriverBuildURL)
+        try Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftDriverURL.path()], workingDirectory: swiftDriverBuildURL)
+        try Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftDriverBuildURL)
         print("Built swift-driver")
 
         print("Building swift-build in \(swiftBuildBuildURL)")
-        try await Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftBuildURL.path()], workingDirectory: swiftBuildBuildURL)
-        try await Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftBuildBuildURL)
+        try Process.checkNonZeroExit(url: cmakeURL, arguments: sharedCMakeArgs + [swiftBuildURL.path()], workingDirectory: swiftBuildBuildURL)
+        try Process.checkNonZeroExit(url: ninjaURL, arguments: [], workingDirectory: swiftBuildBuildURL)
         print("Built swift-build")
     }
 
@@ -166,29 +168,18 @@ enum OS {
 }
 
 extension Process {
-    func run() async throws {
-        try await withCheckedThrowingContinuation { continuation in
-            terminationHandler = { _ in
-                continuation.resume()
-            }
-
-            do {
-                try run()
-            } catch {
-                terminationHandler = nil
-                continuation.resume(throwing: error)
-            }
-        }
-    }
-
-    static func checkNonZeroExit(url: URL, arguments: [String], workingDirectory: URL, environment: [String: String]? = nil) async throws {
+    static func checkNonZeroExit(url: URL, arguments: [String], workingDirectory: URL, environment: [String: String]? = nil) throws {
         print("\(url.path()) \(arguments.joined(separator: " "))")
         let process = Process()
         process.executableURL = url
         process.arguments = arguments
         process.currentDirectoryURL = workingDirectory
         process.environment = environment
-        try await process.run()
+        process.standardOutput = nil
+        process.standardError = nil
+        process.standardInput = nil
+        try process.run()
+        process.waitUntilExit()
         if process.terminationStatus != 0 {
             throw Errors.processError(terminationReason: process.terminationReason, terminationStatus: process.terminationStatus)
         }