Skip to content

Commit b3bd3e7

Browse files
committed
Revert postgres, sql-kit and swiftql vapor builds
1 parent e27a1d3 commit b3bd3e7

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

frameworks/Swift/vapor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PostgreSQL
1212

1313
## Versions
1414

15-
[5.10](https://swift.org/)
15+
[Swift 5.10](https://swift.org/)
1616
[Vapor 4](https://vapor.codes/)
1717

1818
## Test URLs: `vapor`

frameworks/Swift/vapor/vapor-postgres.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:6.1 AS build
4+
FROM swift:5.10 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
@@ -15,7 +15,7 @@ RUN swift build \
1515
# ================================
1616
# Run image
1717
# ================================
18-
FROM swift:6.1-slim
18+
FROM swift:5.10-slim
1919
WORKDIR /run
2020

2121
# Copy build artifacts

frameworks/Swift/vapor/vapor-sql-kit.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:6.1 AS build
4+
FROM swift:5.10 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
@@ -15,7 +15,7 @@ RUN swift build \
1515
# ================================
1616
# Run image
1717
# ================================
18-
FROM swift:6.1-slim
18+
FROM swift:5.10-slim
1919
WORKDIR /run
2020

2121
# Copy build artifacts

frameworks/Swift/vapor/vapor-swifql.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.10 AS build
4+
FROM swift:5.10 as build
55
WORKDIR /build
66

77
# Copy entire repo into container

frameworks/Swift/vapor/vapor-swifql/Package.swift

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "vapor-swifql-ikiga",
77
platforms: [
8-
.macOS(.v12)
8+
.macOS(.v12)
99
],
1010
products: [
1111
.executable(name: "app", targets: ["App"])
@@ -39,10 +39,8 @@ let package = Package(
3939
]
4040
)
4141

42-
var swiftSettings: [SwiftSetting] {
43-
[
44-
.enableUpcomingFeature("DisableOutwardActorInference"),
45-
.enableExperimentalFeature("StrictConcurrency"),
46-
.unsafeFlags(["-parse-as-library"]),
47-
]
48-
}
42+
var swiftSettings: [SwiftSetting] { [
43+
.enableUpcomingFeature("DisableOutwardActorInference"),
44+
.enableExperimentalFeature("StrictConcurrency"),
45+
.unsafeFlags(["-parse-as-library"]),
46+
] }

0 commit comments

Comments
 (0)