Skip to content

Commit

Permalink
Merge pull request #145 from d-exclaimation/hotfix-update-deps
Browse files Browse the repository at this point in the history
Hotfix update deps
  • Loading branch information
d-exclaimation authored Nov 16, 2024
2 parents c412d36 + 7520cfb commit abe3e58
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 52 deletions.
12 changes: 2 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,9 @@ on:
- 'version-*'

jobs:
five-six:
five:
container:
image: swift:5.6
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: swift build
- run: swift test
latest:
container:
image: swift:latest
image: swift:5.10
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Get the latest tag for Swift on Linux (non-slim one)
FROM swift:latest AS latest
FROM swift:5.10 AS latest

WORKDIR /latest

Expand Down
75 changes: 42 additions & 33 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
"state": {
"branch": null,
"revision": "78db67e5bf4a8543075787f228e8920097319281",
"version": "1.18.0"
"revision": "0ae99db85b2b9d1e79b362bd31fd1ffe492f7c47",
"version": "1.21.2"
}
},
{
Expand All @@ -24,26 +24,26 @@
"repositoryURL": "https://github.com/vapor/console-kit.git",
"state": {
"branch": null,
"revision": "447f1046fb4e9df40973fe426ecb24a6f0e8d3b4",
"version": "4.6.0"
"revision": "966d89ae64cd71c652a1e981bc971de59d64f13d",
"version": "4.15.1"
}
},
{
"package": "Graphiti",
"repositoryURL": "https://github.com/GraphQLSwift/Graphiti.git",
"state": {
"branch": null,
"revision": "f80bd1342e52b9ee9e19f7f017dc4545e6c3cb6d",
"version": "1.10.1"
"revision": "ed06f0608a72176fd572763660e7492bfb53a419",
"version": "1.15.1"
}
},
{
"package": "GraphQL",
"repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git",
"state": {
"branch": null,
"revision": "1b9d48ce0f0ad8280f75ce9914579aaac5881bc6",
"version": "2.5.1"
"revision": "ec809df8cce95d6aea820f70f04067abc08080f2",
"version": "2.10.3"
}
},
{
Expand All @@ -60,8 +60,8 @@
"repositoryURL": "https://github.com/vapor/routing-kit.git",
"state": {
"branch": null,
"revision": "611bc45c5dfb1f54b84d99b89d1f72191fb6b71b",
"version": "4.7.2"
"revision": "8c9a227476555c55837e569be71944e02a056b72",
"version": "4.9.1"
}
},
{
Expand All @@ -82,15 +82,6 @@
"version": "1.1.0"
}
},
{
"package": "swift-backtrace",
"repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
"state": {
"branch": null,
"revision": "f25620d5d05e2f1ba27154b40cafea2b67566956",
"version": "1.3.3"
}
},
{
"package": "swift-collections",
"repositoryURL": "https://github.com/apple/swift-collections",
Expand All @@ -109,49 +100,58 @@
"version": "2.5.0"
}
},
{
"package": "swift-http-types",
"repositoryURL": "https://github.com/apple/swift-http-types",
"state": {
"branch": null,
"revision": "ef18d829e8b92d731ad27bb81583edd2094d1ce3",
"version": "1.3.1"
}
},
{
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "32e8d724467f8fe623624570367e3d50c5638e46",
"version": "1.5.2"
"revision": "9cb486020ebf03bfa5b5df985387a14a98744537",
"version": "1.6.1"
}
},
{
"package": "swift-metrics",
"repositoryURL": "https://github.com/apple/swift-metrics.git",
"state": {
"branch": null,
"revision": "34025104068262db0cc998ace178975c5ff4f36b",
"version": "2.4.0"
"revision": "e0165b53d49b413dd987526b641e05e246782685",
"version": "2.5.0"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "6213ba7a06febe8fef60563a4a7d26a4085783cf",
"version": "2.54.0"
"revision": "914081701062b11e3bb9e21accc379822621995e",
"version": "2.76.1"
}
},
{
"package": "swift-nio-extras",
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
"state": {
"branch": null,
"revision": "0e0d0aab665ff1a0659ce75ac003081f2b1c8997",
"version": "1.19.0"
"revision": "2e9746cfc57554f70b650b021b6ae4738abef3e6",
"version": "1.24.1"
}
},
{
"package": "swift-nio-http2",
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
"state": {
"branch": null,
"revision": "a8ccf13fa62775277a5d56844878c828bbb3be1a",
"version": "1.27.0"
"revision": "eaa71bb6ae082eee5a07407b1ad0cbd8f48f9dca",
"version": "1.34.1"
}
},
{
Expand All @@ -168,8 +168,8 @@
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
"state": {
"branch": null,
"revision": "41f4098903878418537020075a4d8a6e20a0b182",
"version": "1.17.0"
"revision": "bbd5e63cf949b7db0c9edaf7a21e141c52afe214",
"version": "1.23.0"
}
},
{
Expand All @@ -181,13 +181,22 @@
"version": "1.0.2"
}
},
{
"package": "swift-system",
"repositoryURL": "https://github.com/apple/swift-system.git",
"state": {
"branch": null,
"revision": "c8a44d836fe7913603e246acab7c528c2e780168",
"version": "1.4.0"
}
},
{
"package": "vapor",
"repositoryURL": "https://github.com/vapor/vapor.git",
"state": {
"branch": null,
"revision": "9a340de4995e5a9dade4ff4c51cd2e6ae30c12d6",
"version": "4.77.0"
"revision": "9786a424db75c4e9eb53e255ce1268675b680562",
"version": "4.106.3"
}
},
{
Expand Down
11 changes: 3 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,17 @@ let package = Package(
.macOS(.v10_15),
],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
name: "Pioneer",
targets: ["Pioneer"]
),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "2.4.5"),
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "1.2.2"),
.package(url: "https://github.com/vapor/vapor.git", from: "4.77.0"),
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "2.10.3"),
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "1.15.1"),
.package(url: "https://github.com/vapor/vapor.git", from: "4.106.3"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
.target(
name: "Pioneer",
dependencies: [
Expand Down

0 comments on commit abe3e58

Please sign in to comment.