Skip to content

Commit 4c92a11

Browse files
committed
Bump minimum Swift version to 5.7
Motivation: Now that Swift 5.9 is GM we should update the supported versions and remove 5.6 Modifications: * Update `Package.swift` * Delete the <5.7 docker compose files and make a 5.10 one * Update the 5.9 docker file to stop using nightlies Result: Remove support for Swift 5.6, add 5.10
1 parent 45a31b6 commit 4c92a11

11 files changed

+22
-131
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.6
1+
// swift-tools-version:5.7
22

33
import PackageDescription
44

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG swift_version=5.6
1+
ARG swift_version=5.7
22
ARG ubuntu_version=focal
33
ARG base_image=swift:$swift_version-$ubuntu_version
44
FROM $base_image

docker/docker-compose.1604.51.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

docker/docker-compose.1804.50.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker/docker-compose.1804.52.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker/docker-compose.1804.53.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker/docker-compose.2004.54.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker/docker-compose.2004.55.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker/docker-compose.2004.56.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

docker/docker-compose.2204.510.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-service-lifecycle:22.04-5.10
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-5.10-jammy"
10+
11+
test:
12+
image: swift-service-lifecycle:22.04-5.10
13+
environment:
14+
- SKIP_SIGNAL_TEST=true
15+
- FORCE_TEST_DISCOVERY=--enable-test-discovery
16+
17+
shell:
18+
image: swift-service-lifecycle:22.04-5.10

docker/docker-compose.2204.59.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ services:
66
image: swift-service-lifecycle:22.04-5.9
77
build:
88
args:
9-
base_image: "swiftlang/swift:nightly-5.9-jammy"
9+
ubuntu_version: "jammy"
10+
swift_version: "5.9"
1011

1112
test:
1213
image: swift-service-lifecycle:22.04-5.9

0 commit comments

Comments
 (0)