From 20706892c059c20319b04b362e2f63705c40380b Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Wed, 6 Nov 2024 21:03:49 -0700 Subject: [PATCH 1/3] build: Expands GraphQL & Graphiti dependencies --- Package.resolved | 4 ++-- Package.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 7fe0d5b..dbd8c14 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git", "state": { "branch": null, - "revision": "87649dbc3cdab0be0256c86235f2aec22ec1bfc1", - "version": "2.10.0" + "revision": "ec809df8cce95d6aea820f70f04067abc08080f2", + "version": "2.10.3" } }, { diff --git a/Package.swift b/Package.swift index 1866484..6bfc842 100644 --- a/Package.swift +++ b/Package.swift @@ -7,8 +7,8 @@ let package = Package( .library(name: "GraphQLRxSwift", targets: ["GraphQLRxSwift"]), ], dependencies: [ - .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "2.0.0"), - .package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "1.0.0"), + .package(url: "https://github.com/GraphQLSwift/GraphQL.git", "2.0.0" ..< "4.0.0"), + .package(url: "https://github.com/GraphQLSwift/Graphiti.git", "1.0.0" ..< "3.0.0"), .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.1.0"), ], targets: [ From ccc29cdd7a04bbcc15f55b429edcbc5925a9f499 Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Thu, 7 Nov 2024 10:07:24 -0700 Subject: [PATCH 2/3] ci: Disable swift 6 CI This is because swift-action hasn't yet merged swift 6 support --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bff981..c9fbd06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - swift: ["5.7", "5.8", "5.9", "5.10", "6.0"] + swift: ["5.7", "5.8", "5.9", "5.10"] steps: - uses: swift-actions/setup-swift@v2 with: From ea1bf09ebd5978e2f40c3c148d903f5b9318b36d Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Thu, 7 Nov 2024 23:13:08 -0700 Subject: [PATCH 3/3] ci: Drops testing on <5.8 --- .github/workflows/build.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9fbd06..884a7d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,26 +61,11 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - swift: ["5.7", "5.8", "5.9", "5.10"] + swift: ["5.8", "5.9", "5.10"] steps: - uses: swift-actions/setup-swift@v2 with: swift-version: ${{ matrix.swift }} - uses: actions/checkout@v3 - name: Test - run: swift test --parallel - - # Swift versions older than 5.7 don't have builds for 22.04. https://www.swift.org/download/ - backcompat-ubuntu-20_04: - name: Test Swift ${{ matrix.swift }} on Ubuntu 20.04 - runs-on: ubuntu-20.04 - strategy: - matrix: - swift: ["5.4", "5.5", "5.6"] - steps: - - uses: swift-actions/setup-swift@v2 - with: - swift-version: ${{ matrix.swift }} - - uses: actions/checkout@v3 - - name: Test - run: swift test --parallel + run: swift test --parallel \ No newline at end of file