Portable build tool / Windows testing

.github/workflows/build-and-test.yml

@@ -137,16 +137,18 @@ jobs:
             https://github.com/apple/swift-package-manager/issues/6595" && false) )
 
   build-native-windows:
-    name: "Native, no testing: windows-latest/release"
+    name: "Native: windows-latest, debug"
     strategy:
       fail-fast: false
     runs-on: windows-latest
     steps:
     - name: Setup swift
       uses: compnerd/gha-setup-swift@main
       with:
-        branch: swift-5.8.1-release
-        tag: 5.8.1-RELEASE
+        github-repo: thebrowsercompany/swift-build
+        release-asset-name: installer-amd64.exe
+        release-tag-name: 20231010.3
+        github-token: ${{ secrets.GITHUB_TOKEN }}
 
     - uses: actions/checkout@v3
 
@@ -159,26 +161,25 @@ jobs:
         7z x llvm-15.0.6-windows-x86-msvc17-msvcrt.7z -oC:\
         Add-Content $env:GITHUB_PATH 'C:\llvm-15.0.6-windows-x86-msvc17-msvcrt\bin'
 
-    - name: Copy LLVM's include and lib to include and lib folder of MSVC
-      run: |
-        xcopy c:\llvm-15.0.6-windows-x86-msvc17-msvcrt\include\*.* c:\program" "files\microsoft" "visual" "studio\2022\enterprise\vc\tools\msvc\${{ env.VCToolsVersion }}\include\ /s /h
-        xcopy c:\llvm-15.0.6-windows-x86-msvc17-msvcrt\lib\*.* c:\program" "files\microsoft" "visual" "studio\2022\enterprise\vc\tools\msvc\${{ env.VCToolsVersion }}\lib\x64\ /s /h
-
     - run: llvm-config --version
 
+    - name: Generate LLVM pkgconfig file
+      run: |
+        swift package resolve
+        & "C:\Program Files\Git\bin\bash.exe" .build/checkouts/Swifty-LLVM/Tools/make-pkgconfig.sh llvm.pc
+        type llvm.pc
+
     - name: Build support library
       run: clang -c ./Library/Hylo/LibC.c -o HyloLibC.lib
 
-    - name: Copy support library
-      run: xcopy HyloLibC.lib c:\program" "files\microsoft" "visual" "studio\2022\enterprise\vc\tools\msvc\${{ env.VCToolsVersion }}\lib\x64\
+    - name: Prevent reentrant builds for speed
+      run: echo 'HYLO_NO_REENTRANT_BUILD=1' >> $env:GITHUB_ENV
 
-    - name: Build (Release)
-      id: build
-      continue-on-error: true
-      run: swift build -v -c release
+    - name: Non-test build ensuring that build tools have been built
+      run: swift build --pkg-config-path .
 
-    - name: Retry on failure
-      continue-on-error: false
-      if: steps.build.outcome != 'success'
-      run: swift build -v -c release
+    - name: Build tests
+      run: swift build --build-tests --pkg-config-path .
 
+    - name: Test
+      run: swift test --skip-build --pkg-config-path .

Package.resolved

@@ -119,4 +119,4 @@
     }
   ],
   "version" : 2
-}
+}

Package.swift

@@ -1,6 +1,12 @@
 // swift-tools-version:5.7
 import PackageDescription
 
+#if os(Windows)
+let onWindows = true
+#else
+let onWindows = false
+#endif
+
 /// Settings to be passed to swiftc for all targets.
 let allTargetsSwiftSettings: [SwiftSetting] = [
   .unsafeFlags(["-warnings-as-errors"])
@@ -126,15 +132,16 @@ let package = Package(
 
     .plugin(
       name: "TestGeneratorPlugin", capability: .buildTool(),
-      dependencies: [.target(name: "GenerateHyloFileTests")]),
+      // Workaround for SPM bug; see PortableBuildToolPlugin.swift
+      dependencies: onWindows ? [] : ["GenerateHyloFileTests"]),
 
     .executableTarget(
       name: "GenerateHyloFileTests",
       dependencies: [
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         "Utils",
       ],
-      swiftSettings: allTargetsSwiftSettings),
+      swiftSettings: allTargetsSwiftSettings + [ .unsafeFlags(["-parse-as-library"]) ]),
 
     // Test targets.
     .testTarget(
@@ -144,7 +151,7 @@ let package = Package(
 
     .testTarget(
       name: "DriverTests",
-      dependencies: ["Driver"],
+      dependencies: ["Driver", "TestUtils"],
       swiftSettings: allTargetsSwiftSettings),
 
     .testTarget(