Merge branch 'main' into jobs-retention

Author: thoven87

.github/workflows/ci.yml

@@ -20,9 +20,9 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'swift:5.9'
           - 'swift:5.10'
           - 'swift:6.0'
+          - 'swift:6.1'
         postgres-image:
           - 'postgres:17'
           - 'postgres:16'

.github/workflows/nightly.yml

@@ -10,17 +10,35 @@ jobs:
     strategy:
       matrix:
         image: ['nightly-focal', 'nightly-jammy', 'nightly-amazonlinux2']
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --entrypoint redis-server
+        postgres-image:
+            - "postgres:17"
+            - "postgres:14"
+        include:
+            - postgres-image: postgres:17
+              postgres-auth: scram-sha-256
+            - postgres-image: postgres:14
+              postgres-auth: md5
 
     container:
       image: swiftlang/swift:${{ matrix.image }}
+      volumes: ["pgrunshare:/var/run/postgresql"]
       env:
-        REDIS_HOSTNAME: "redis"
+          POSTGRES_DB: "test_database"
+          POSTGRES_USER: "test_user"
+          POSTGRES_PASSWORD: "test_password"
+          POSTGRES_HOSTNAME: "psql"
+          POSTGRES_SOCKET: "/var/run/postgresql/.s.PGSQL.5432"
+          POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
+    services:
+        psql:
+            image: ${{ matrix.postgres-image }}
+            volumes: ["pgrunshare:/var/run/postgresql"]
+            env:
+                POSTGRES_DB: "test_database"
+                POSTGRES_USER: "test_user"
+                POSTGRES_PASSWORD: "test_password"
+                POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
+                POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.postgres-auth }}
 
     steps:
     - name: Checkout

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
 import PackageDescription
 
@@ -10,15 +10,15 @@ let package = Package(
     ],
     dependencies: [
         // TODO: use a released version of swift-jobs
-        .package(url: "https://github.com/hummingbird-project/swift-jobs.git", branch: "main"),
-        .package(url: "https://github.com/hummingbird-project/hummingbird-postgres.git", from: "0.6.0"),
+        .package(url: "https://github.com/hummingbird-project/swift-jobs.git", from: "1.0.0-beta.8"),
+        .package(url: "https://github.com/hummingbird-project/postgres-migrations.git", from: "0.1.0"),
         .package(url: "https://github.com/vapor/postgres-nio.git", from: "1.25.0"),
     ],
     targets: [
         .target(
             name: "JobsPostgres",
             dependencies: [
-                .product(name: "PostgresMigrations", package: "hummingbird-postgres"),
+                .product(name: "PostgresMigrations", package: "postgres-migrations"),
                 .product(name: "Jobs", package: "swift-jobs"),
                 .product(name: "PostgresNIO", package: "postgres-nio"),
             ]

Tests/JobsPostgresTests/JobsTests.swift

@@ -412,7 +412,7 @@ final class JobsTests: XCTestCase {
         struct TestParameters: JobParameters {
             static let jobName = "testErrorRetryCount"
         }
-        let expectation = XCTestExpectation(description: "TestJob.execute was called", expectedFulfillmentCount: 4)
+        let expectation = XCTestExpectation(description: "TestJob.execute was called", expectedFulfillmentCount: 3)
         struct FailedError: Error {}
         try await self.testJobQueue(numWorkers: 1) { jobQueue in
             jobQueue.registerJob(