Преглед изворни кода

Swift 5.5 (#6828)

* Swift 5.5 for hummingbird

* Swift 5.5 for SwiftNIO

* Swift 5.5 for Vapor
Adam Fowler пре 3 година
родитељ
комит
df692555db

+ 2 - 3
frameworks/Swift/hummingbird/hummingbird-postgres.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./src-postgres .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Copy build artifacts

+ 2 - 3
frameworks/Swift/hummingbird/hummingbird.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./src .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Copy build artifacts

+ 3 - 3
frameworks/Swift/hummingbird/src-postgres/Package.swift

@@ -10,9 +10,9 @@ let package = Package(
         .executable(name: "server", targets: ["server"])
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.11.0")),
-        .package(url: "https://github.com/hummingbird-project/hummingbird-mustache.git", .upToNextMinor(from: "0.5.0")),
-        .package(url: "https://github.com/vapor/postgres-kit.git", from: "2.0.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.13.1")),
+        .package(url: "https://github.com/hummingbird-project/hummingbird-mustache.git", from: "1.0.0"),
+        .package(url: "https://github.com/vapor/postgres-kit.git", from: "2.3.0"),
     ],
     targets: [
         .target(name: "server",

+ 1 - 1
frameworks/Swift/hummingbird/src/Package.swift

@@ -9,7 +9,7 @@ let package = Package(
         .executable(name: "server", targets: ["server"])
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.11.0")),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.13.1")),
     ],
     targets: [
         .target(name: "server",

+ 2 - 3
frameworks/Swift/swift-nio/swift-nio.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./app .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Install Swift dependencies

+ 2 - 3
frameworks/Swift/vapor/vapor-fluent.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./vapor-fluent .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Copy build artifacts

+ 2 - 3
frameworks/Swift/vapor/vapor-postgres.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./vapor-postgres .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Copy build artifacts

+ 2 - 3
frameworks/Swift/vapor/vapor-sql-kit.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./vapor-sql-kit .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Copy build artifacts

+ 2 - 3
frameworks/Swift/vapor/vapor.dockerfile

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3 as build
+FROM swift:5.5 as build
 WORKDIR /build
 
 # Copy entire repo into container
@@ -9,14 +9,13 @@ COPY ./vapor-default .
 
 # Compile with optimizations
 RUN swift build \
-	--enable-test-discovery \
 	-c release \
 	-Xswiftc -enforce-exclusivity=unchecked
 
 # ================================
 # Run image
 # ================================
-FROM swift:5.3-slim
+FROM swift:5.5-slim
 WORKDIR /run
 
 # Copy build artifacts