Skip to content

Commit 44319ea

Browse files
committed
Set Swift 5.5 as the minimum version
1 parent 4e2217c commit 44319ea

File tree

7 files changed

+42
-111
lines changed

7 files changed

+42
-111
lines changed

.gitlab/ci/centos-7.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@ include: '/.gitlab/ci/platform-test.yml'
1010

1111
swift trunk:
1212
extends: .centos7
13-
image: swiftlang/swift:nightly-master-centos7
14-
except:
13+
image: swiftlang/swift:nightly-main-centos7
1514

16-
swift 5.5:
15+
swift 5.7:
1716
extends: .centos7
18-
image: swift:5.5-centos7
17+
image: swiftlang/swift:nightly-5.7-centos7
1918

20-
swift 5.4:
19+
swift 5.6:
2120
extends: .centos7
22-
image: swift:5.4-centos7
21+
image: swift:5.6-centos7
2322

24-
swift 5.3:
23+
swift 5.5:
2524
extends: .centos7
26-
image: swift:5.3-centos7
25+
image: swift:5.5-centos7

.gitlab/ci/eol-platforms-5.5.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
include: '/.gitlab/ci/platform-test.yml'
2+
3+
swift 5.5:
4+
extends: .platform-test
5+
image: swift:5.5-${SWIFT_PLATFORM_NAME}

.gitlab/ci/main.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,17 @@ Code Climate:
6464
strategy: depend
6565
include: '/.gitlab/ci/standard-platforms.yml'
6666

67-
Ubuntu Bionic:
67+
Ubuntu Xenial:
6868
extends: .standard-platform-test
6969
variables:
70-
SWIFT_PLATFORM_NAME: bionic
70+
SWIFT_PLATFORM_NAME: xenial
71+
trigger:
72+
include: '/.gitlab/ci/eol-platforms-5.5.yml'
7173

72-
Ubuntu Xenial:
74+
Ubuntu Bionic:
7375
extends: .standard-platform-test
7476
variables:
75-
SWIFT_PLATFORM_NAME: xenial
77+
SWIFT_PLATFORM_NAME: bionic
7678

7779
Ubuntu Focal:
7880
extends: .standard-platform-test
@@ -88,6 +90,8 @@ CentOS 8:
8890
extends: .standard-platform-test
8991
variables:
9092
SWIFT_PLATFORM_NAME: centos8
93+
trigger:
94+
include: '/.gitlab/ci/eol-platforms-5.5.yml'
9195

9296
Amazon Linux 2:
9397
extends: .standard-platform-test

.gitlab/ci/standard-platforms.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@ include: '/.gitlab/ci/platform-test.yml'
22

33
swift trunk:
44
extends: .platform-test
5-
image: swiftlang/swift:nightly-master-${SWIFT_PLATFORM_NAME}
6-
except:
5+
image: swiftlang/swift:nightly-main-${SWIFT_PLATFORM_NAME}
76

8-
swift 5.5:
7+
swift 5.7:
98
extends: .platform-test
10-
image: swift:5.5-${SWIFT_PLATFORM_NAME}
9+
image: swiftlang/swift:nightly-5.7-${SWIFT_PLATFORM_NAME}
1110

12-
swift 5.4:
11+
swift 5.6:
1312
extends: .platform-test
14-
image: swift:5.4-${SWIFT_PLATFORM_NAME}
13+
image: swift:5.6-${SWIFT_PLATFORM_NAME}
1514

16-
swift 5.3:
15+
swift 5.5:
1716
extends: .platform-test
18-
image: swift:5.3-${SWIFT_PLATFORM_NAME}
17+
image: swift:5.5-${SWIFT_PLATFORM_NAME}

Package.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.5
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the RediStack open source project
@@ -36,8 +36,7 @@ let package = Package(
3636
.product(name: "Logging", package: "swift-log"),
3737
.product(name: "Metrics", package: "swift-metrics"),
3838
.product(name: "ServiceDiscovery", package: "swift-service-discovery")
39-
],
40-
exclude: ["Documentation.docc"]
39+
]
4140
),
4241
.testTarget(
4342
name: "RediStackTests",
@@ -48,7 +47,7 @@ let package = Package(
4847
]
4948
),
5049

51-
.target(name: "RedisTypes", dependencies: ["RediStack"], exclude: ["Documentation.docc"]),
50+
.target(name: "RedisTypes", dependencies: ["RediStack"]),
5251
.testTarget(
5352
name: "RedisTypesTests",
5453
dependencies: [
@@ -62,8 +61,7 @@ let package = Package(
6261
dependencies: [
6362
.product(name: "NIO", package: "swift-nio"),
6463
"RediStack"
65-
],
66-
exclude: ["Documentation.docc"]
64+
]
6765
),
6866

6967
.testTarget(

[email protected]

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

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,17 @@ This policy is to balance the desire for as much backwards compatibility as poss
124124
The following table shows the combination of Swift language versions and operating systems that
125125
receive regular unit testing (either in development, or with CI) against the **current version** of **RediStack**.
126126

127-
| Platform | Swift 5.3 | 5.4 | 5.5 | Trunk |
128-
|:----------------------|:---------:|:---:|:---:|:-----:|
129-
| macOS Latest (Intel) | | || |
130-
| Ubuntu 20.04 (Focal) |||||
131-
| Ubuntu 18.04 (Bionic) |||||
132-
| Ubuntu 16.04 (Xenial) |||||
133-
| Amazon Linux 2 |||||
134-
| CentOS 8 |||||
135-
| CentOS 7 |||||
127+
| Platform | Swift 5.5 | 5.6 | 5.7 | Trunk |
128+
|:----------------------------|:---------:|:---:|:---:|:-----:|
129+
| macOS Latest (M1) | | || |
130+
| Ubuntu 20.04 (Focal) |||||
131+
| Ubuntu 18.04 (Bionic) |||||
132+
| Ubuntu 16.04 (Xenial)**³** |||||
133+
| Amazon Linux 2 |||||
134+
| CentOS 8**³** |||||
135+
| CentOS 7 |||||
136+
137+
> **³** _CentOS 8 and Ubuntu 16.04 are no longer officially supported by Swift after [Swift 5.5](https://github.com/apple/swift-docker/pull/273)._
136138
137139
For older versions of **RediStack**, view each summary below.
138140

0 commit comments

Comments
 (0)