From 37b8a4846ff70c81b3b018b71a2fe0ad43f25370 Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Mon, 9 Dec 2019 14:02:28 -0500 Subject: [PATCH] beta.2 --- .github/workflows/test.yml | 24 ++++---------------- Package.swift | 6 ++--- Tests/LinuxMain.swift | 8 ------- Tests/PostgresKitTests/XCTestManifests.swift | 21 ----------------- 4 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 Tests/LinuxMain.swift delete mode 100644 Tests/PostgresKitTests/XCTestManifests.swift diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14930424..6ac3e488 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,8 @@ jobs: POSTGRES_PASSWORD: vapor_password runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - run: swift test + - uses: actions/checkout@v1 + - run: swift test --enable-test-discovery --sanitize=thread bionic: container: image: vapor/swift:5.1-bionic @@ -32,21 +32,5 @@ jobs: POSTGRES_PASSWORD: vapor_password runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - run: swift test - thread: - container: - image: vapor/swift:5.1-bionic - services: - psql: - image: postgres - ports: - - 5432:5432 - env: - POSTGRES_USER: vapor_username - POSTGRES_DB: vapor_database - POSTGRES_PASSWORD: vapor_password - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - run: swift test --sanitize=thread + - uses: actions/checkout@v1 + - run: swift test --enable-test-discovery --sanitize=thread diff --git a/Package.swift b/Package.swift index 9603e6bd..1a041d32 100644 --- a/Package.swift +++ b/Package.swift @@ -10,9 +10,9 @@ let package = Package( .library(name: "PostgresKit", targets: ["PostgresKit"]), ], dependencies: [ - .package(url: "https://github.com/vapor/postgres-nio.git", .branch("master")), - .package(url: "https://github.com/vapor/sql-kit.git", .branch("master")), - .package(url: "https://github.com/vapor/async-kit.git", .branch("master")), + .package(url: "https://github.com/vapor/postgres-nio.git", from: "1.0.0-beta.2"), + .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0-beta.2"), + .package(url: "https://github.com/vapor/async-kit.git", from: "1.0.0-beta.2"), ], targets: [ .target(name: "PostgresKit", dependencies: ["AsyncKit", "PostgresNIO", "SQLKit"]), diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift deleted file mode 100644 index 3d579e73..00000000 --- a/Tests/LinuxMain.swift +++ /dev/null @@ -1,8 +0,0 @@ -import XCTest - -import PostgresKitTests - -var tests = [XCTestCaseEntry]() -tests += PostgresKitTests.__allTests() - -XCTMain(tests) diff --git a/Tests/PostgresKitTests/XCTestManifests.swift b/Tests/PostgresKitTests/XCTestManifests.swift deleted file mode 100644 index 7160463d..00000000 --- a/Tests/PostgresKitTests/XCTestManifests.swift +++ /dev/null @@ -1,21 +0,0 @@ -#if !canImport(ObjectiveC) -import XCTest - -extension PostgresKitTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__PostgresKitTests = [ - ("testCreateEnumWithBuilder", testCreateEnumWithBuilder), - ("testDropEnumWithBuilder", testDropEnumWithBuilder), - ("testPerformance", testPerformance), - ("testSQLKitBenchmark", testSQLKitBenchmark), - ] -} - -public func __allTests() -> [XCTestCaseEntry] { - return [ - testCase(PostgresKitTests.__allTests__PostgresKitTests), - ] -} -#endif