Merge pull request #4020 from SwiftPackageIndex/swift-6.3-base-image

Update to Swift 6.3 base image

Author: finestructure

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/finestructure/spi-base:2.1.1
+FROM registry.gitlab.com/finestructure/spi-base:2.2.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:2.1.1
+      image: registry.gitlab.com/finestructure/spi-base:2.2.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:2.1.1
+      image: registry.gitlab.com/finestructure/spi-base:2.2.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:2.1.1
+      image: registry.gitlab.com/finestructure/spi-base:2.2.0
     steps:
       - name: Checkout code
         uses: actions/checkout@v6

Dockerfile

@@ -18,7 +18,7 @@
 # ================================
 # Build image
 # ================================
-FROM registry.gitlab.com/finestructure/spi-base:2.1.1 AS build
+FROM registry.gitlab.com/finestructure/spi-base:2.2.0 AS build
 
 # Set up a build area
 WORKDIR /build
@@ -65,7 +65,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
 # ================================
 # Run image
 # ================================
-FROM registry.gitlab.com/finestructure/spi-base:2.1.1
+FROM registry.gitlab.com/finestructure/spi-base:2.2.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:2.1.1 swift test
+docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:2.2.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:2.1.1 \
+	  registry.gitlab.com/finestructure/spi-base:2.2.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.10.0"),
+        .package(url: "https://github.com/SwiftPackageIndex/SPIManifest.git", from: "1.12.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/SwiftPackageIndex/swift-package-manager.git", branch: "release/6.1"),

Package.swift

@@ -264,37 +264,76 @@ enum Ingestion {
         }
     }
 
+#if compiler(>=6.3.1)
+#error("Check if we can revert commit a5ec37ecd58d4971b5a04305d39fe7666b69bde3 `Convert Ingestion.fetchMetadata` (2026-04-08)")
+#endif
 
     static func fetchMetadata(package: Package, owner: String, repository: String) async throws(Github.Error) -> (Github.Metadata, Github.License?, Github.Readme?) {
         @Dependency(\.environment) var environment
         if environment.shouldFail(failureMode: .fetchMetadataFailed) {
             throw Github.Error.requestFailed(.internalServerError)
         }
 
-        // Need to pull in github functions individually, because otherwise the `async let` will trigger a
-        // concurrency error if github gets used more than once:
-        //   Sending 'github' into async let risks causing data races between async let uses and local uses
-        @Dependency(\.github.fetchMetadata) var fetchMetadata
-        @Dependency(\.github.fetchLicense) var fetchLicense
-        @Dependency(\.github.fetchReadme) var fetchReadme
+        // 2026-04-08, sas: revert this back to `async let` instead of `withThrowingTaskGroup` when a fix for https://github.com/swiftlang/swift/issues/75501 is available.
+        do {
+            enum FetchResult: Sendable {
+                case metadata(Github.Metadata)
+                case license(Github.License?)
+                case readme(Github.Readme?)
+            }
 
-        async let metadata = try await fetchMetadata(owner, repository)
-        async let license = await fetchLicense(owner, repository)
-        async let readme = await fetchReadme(owner, repository)
+            let results = try await withThrowingTaskGroup(of: FetchResult.self) { group in
+                group.addTask {
+                    @Dependency(\.github.fetchMetadata) var fetchMetadata
+                    return .metadata(try await fetchMetadata(owner, repository))
+                }
+                group.addTask {
+                    @Dependency(\.github.fetchLicense) var fetchLicense
+                    return .license(await fetchLicense(owner, repository))
+                }
+                group.addTask {
+                    @Dependency(\.github.fetchReadme) var fetchReadme
+                    return .readme(await fetchReadme(owner, repository))
+                }
 
-        do {
-            return try await (metadata, license, readme)
+                var results = [FetchResult]()
+                for try await result in group {
+                    results.append(result)
+                }
+                return results
+            }
+
+            var metadata: Github.Metadata?
+            var license: Github.License?
+            var readme: Github.Readme?
+            for res in results {
+                switch res {
+                    case .metadata(let data):
+                        metadata = data
+                    case .license(let data):
+                        license = data
+                    case .readme(let data):
+                        readme = data
+                }
+            }
+
+            guard let metadata = metadata else {
+                struct MetadataIsNil: Swift.Error { }
+                throw Github.Error.unexpectedError(MetadataIsNil())
+            }
+
+            return (metadata, license, readme)
         } catch let error as Github.Error {
             throw error
         } catch {
             // This whole do { ... } catch { ... } should be unnecessary - it's a workaround for
             // https://github.com/swiftlang/swift/issues/76169
-            assert(false, "Unexpected error type: \(type(of: error))")
-            // We need to throw _something_ here (we should never hit this codepath though)
+                assert(false, "Unexpected error type: \(type(of: error))")
+                // We need to throw _something_ here (we should never hit this codepath though)
             throw Github.Error.unexpectedError(error)
-            // We could theoretically avoid this whole second catch and just do
-            //   error as! GithubError
-            // but let's play it safe and not risk a server crash, unlikely as it may be.
+                // We could theoretically avoid this whole second catch and just do
+                //   error as! GithubError
+                // but let's play it safe and not risk a server crash, unlikely as it may be.
         }
     }
 

Sources/App/Commands/Ingestion.swift

@@ -107,7 +107,7 @@ enum Social {
             throw Error.invalidMessage
         }
         // Ignore errors from here for now to keep concurrency simpler
-        async let _ = try? await httpClient.mastodonPost(message: message)
+        try? await httpClient.mastodonPost(message: message)
     }
 
     static func postToFirehose(client: Client,