Merge branch 'main' into add-forked-from-ui

Author: supersonicbyte

.github/workflows/ci.yml

@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: "0 8 * * *"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test-linux:
     name: Test

.github/workflows/lint.yml

@@ -18,6 +18,10 @@ on:
     workflow_dispatch:
     push:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
     lint-front-end:
         name: Lint Front-End

.github/workflows/query-performance.yml

@@ -18,6 +18,10 @@ on:
   workflow_dispatch:
   push:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test-linux:
     name: Query Performance Test

.github/workflows/snapshots.yml

@@ -18,6 +18,10 @@ on:
   workflow_dispatch:
   push:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   snapshots:
     name: Image Snapshots

Package.resolved

@@ -42,7 +42,8 @@ let package = Package(
         .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0"),
         .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.11.1"),
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"),
-        .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0"),
+        .package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
+        .package(url: "https://github.com/vapor-community/soto-cognito-authentication.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.0.0"),
         .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.13.0"),
@@ -72,6 +73,7 @@ let package = Package(
                     .product(name: "SwiftPMPackageCollections", package: "swift-package-manager"),
                     .product(name: "Vapor", package: "vapor"),
                     .product(name: "VaporToOpenAPI", package: "VaporToOpenAPI"),
+                    .product(name: "SotoCognitoAuthentication", package: "soto-cognito-authentication")
                 ],
                 swiftSettings: swiftSettings,
                 linkerSettings: [.unsafeFlags(["-Xlinker", "-interposable"],

Package.swift

@@ -17,7 +17,7 @@ extension SwiftVersion: BuildResultPresentable {
     var longDisplayName: String { "Swift \(displayName)" }
     var note: String? {
         switch self {
-            case .v6_0: return "beta"
+            // case .v6_0: return "beta"
             default: return nil
         }
     }

Sources/App/Views/PackageController/SwiftVersion+BuildResultPresentable.swift

@@ -31,12 +31,13 @@ public struct S3Store {
     }
 
     public func save(payload: Data, to key: Key) async throws {
-        let client = AWSClient(credentialProvider: .static(accessKeyId: credentials.keyId, secretAccessKey: credentials.secret))
+        let client = AWSClient(credentialProvider: .static(accessKeyId: credentials.keyId, secretAccessKey: credentials.secret),
+                               httpClientProvider: .createNew)
         do {
             let s3 = S3(client: client, region: Self.region)
             let req = S3.PutObjectRequest(
                 acl: .publicRead,  // requires "Block all public access" to be "off"
-                body: .init(buffer: .init(data: payload)),
+                body: .data(payload),
                 bucket: key.bucket,
                 key: key.path
             )

Sources/S3Store/S3Store.swift

@@ -104,7 +104,7 @@ <h2>Build Results</h2>
             <a href="https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/new/choose">raise an issue</a>.
           </p>
           <hr/>
-          <h3>Swift 6.0 (beta)</h3>
+          <h3>Swift 6.0</h3>
           <ul class="matrix builds">
             <li class="row">
               <div class="row-labels">

Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_BuildIndex.1.html

@@ -187,9 +187,7 @@ <h3>Compatibility</h3>
                         </p>
                       </div>
                       <div class="column-labels">
-                        <div>6.0
-                          <small>(beta)</small>
-                        </div>
+                        <div>6.0</div>
                         <div>5.10</div>
                         <div>5.9</div>
                         <div>5.8</div>
@@ -208,9 +206,7 @@ <h3>Compatibility</h3>
                         </p>
                       </div>
                       <div class="column-labels">
-                        <div>6.0
-                          <small>(beta)</small>
-                        </div>
+                        <div>6.0</div>
                         <div>5.10</div>
                         <div>5.9</div>
                         <div>5.8</div>