Merge pull request #3826 from SwiftPackageIndex/swift-6.2-trigger

Fully adopt Swift 6.2

Author: finestructure

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/finestructure/spi-base:1.3.0
+FROM registry.gitlab.com/finestructure/spi-base:2.0.0
 
 # Install SPM build dependencies
 RUN apt-get update && apt-get install -y curl git make unzip \

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/finestructure/spi-base:1.3.0
+      image: registry.gitlab.com/finestructure/spi-base:2.0.0
       options: --privileged
     steps:
       - name: GH Runner bug workaround
@@ -160,7 +160,7 @@ jobs:
     name: Release build
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/finestructure/spi-base:1.3.0
+      image: registry.gitlab.com/finestructure/spi-base:2.0.0
       options: --privileged
     steps:
       - name: GH Runner bug workaround

.github/workflows/query-performance.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     container:
-      image: registry.gitlab.com/finestructure/spi-base:1.3.0
+      image: registry.gitlab.com/finestructure/spi-base:2.0.0
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

Dockerfile

@@ -18,7 +18,7 @@
 # ================================
 # Build image
 # ================================
-FROM registry.gitlab.com/finestructure/spi-base:1.3.0 as build
+FROM registry.gitlab.com/finestructure/spi-base:2.0.0 as build
 
 # Set up a build area
 WORKDIR /build
@@ -62,7 +62,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
 # ================================
 # Run image
 # ================================
-FROM registry.gitlab.com/finestructure/spi-base:1.3.0
+FROM registry.gitlab.com/finestructure/spi-base:2.0.0
 
 # NB sas 2022-09-23: We're not using a dedicated `vapor` user to run the executable, because it
 # makes managing the data in the checkouts volume difficult. See

LOCAL_DEVELOPMENT_SETUP.md

@@ -238,7 +238,7 @@ The trickiest part of this is to ensure the test or app container can connect to
 So, in order to run the tests in a Linux container run:
 
 ```
-docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:1.3.0 swift test
+docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:2.0.0 swift test
 ```
 
 Make sure you use the most recent `spi-base` image. You can find the latest image name in the `test-docker` target, which also provides a convenient way to run all all tests in a docker container.

Makefile

@@ -89,7 +89,7 @@ test-docker:
 	@# run tests inside a docker container
 	docker run --rm -v "$(PWD)":/host -w /host \
 	  --add-host=host.docker.internal:host-gateway \
-	  registry.gitlab.com/finestructure/spi-base:1.3.0 \
+	  registry.gitlab.com/finestructure/spi-base:2.0.0 \
 	  make test
 
 test-e2e: db-reset reconcile ingest analyze

Package.resolved

@@ -32,7 +32,7 @@ let package = Package(
         .package(url: "https://github.com/SwiftPackageIndex/Plot.git", branch: "main"),
         .package(url: "https://github.com/SwiftPackageIndex/CanonicalPackageURL.git", from: "1.0.0"),
         .package(url: "https://github.com/SwiftPackageIndex/DependencyResolution.git", from: "1.1.2"),
-        .package(url: "https://github.com/SwiftPackageIndex/SPIManifest.git", from: "1.9.0"),
+        .package(url: "https://github.com/SwiftPackageIndex/SPIManifest.git", from: "1.10.0"),
         .package(url: "https://github.com/SwiftPackageIndex/SemanticVersion.git", from: "0.3.0"),
         .package(url: "https://github.com/SwiftPackageIndex/ShellOut.git", from: "3.3.0"),
         .package(url: "https://github.com/finestructure/swift-package-manager.git", branch: "release/6.1"),

Package.swift

@@ -389,8 +389,7 @@ struct BuildPair {
                 case .iOS, .linux, .macosSpm, .macosXcodebuild, .tvOS, .watchOS:
                     return BuildPair(platform, swiftVersion)
                 case .visionOS:
-                    // visionOS is only available for Swift versions 5.9+
-                    return swiftVersion >= .v5_9 ? BuildPair(platform, swiftVersion) : nil
+                    return BuildPair(platform, swiftVersion)
                 case .wasm:
                     // Android is supported from Swift version 6.1+
                     return swiftVersion >= .v6_1 ? BuildPair(platform, swiftVersion) : nil

Sources/App/Commands/TriggerBuilds.swift

@@ -18,27 +18,27 @@ extension SwiftVersion {
     // https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/1267#issuecomment-975379966
     // Patch versions are irrelevant here but the underlying type requires one, so use 0
     // in general.
-    static let v5_9: Self = .init(5, 9, 0)
     static let v5_10: Self = .init(5, 10, 0)
     static let v6_0: Self = .init(6, 0, 0)
     static let v6_1: Self = .init(6, 1, 0)
+    static let v6_2: Self = .init(6, 2, 0)
 
     /// Currently supported swift versions for building
     static var allActive: [Self] {
-        [.v5_9, .v5_10, .v6_0, .v6_1]
+        [.v5_10, .v6_0, .v6_1, .v6_2]
     }
 
     var xcodeVersion: String? {
         // NB: this is used for display purposes and not critical for compiler selection
         switch self {
-            case .v5_9:
-                return "Xcode 15.2"
             case .v5_10:
                 return "Xcode 15.4"
             case .v6_0:
                 return "Xcode 16.2"
             case .v6_1:
                 return "Xcode 16.3"
+            case .v6_2:
+                return "Xcode 26.0"
             default:
                 return nil
         }