Skip to content

Commit ba9bfb3

Browse files
committed
Remove Ubuntu 23.10 as it is EOL
1 parent 4e7ca7c commit ba9bfb3

File tree

5 files changed

+1
-54
lines changed

5 files changed

+1
-54
lines changed

Sources/LinuxPlatform/Linux.swift

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ var swiftGPGKeysRefreshed = false
99
public struct Linux: Platform {
1010
let linuxPlatforms = [
1111
PlatformDefinition.ubuntu2404,
12-
PlatformDefinition.ubuntu2310,
1312
PlatformDefinition.ubuntu2204,
1413
PlatformDefinition.ubuntu2004,
1514
PlatformDefinition.ubuntu1804,
@@ -137,27 +136,6 @@ public struct Linux: Platform {
137136
"tzdata",
138137
"zlib1g-dev",
139138
]
140-
case "ubuntu2310":
141-
[
142-
"binutils",
143-
"git",
144-
"unzip",
145-
"gnupg2",
146-
"libc6-dev",
147-
"libcurl4-openssl-dev",
148-
"libedit2",
149-
"libgcc-12-dev",
150-
"libpython3-dev",
151-
"libsqlite3-0",
152-
"libstdc++-12-dev",
153-
"libxml2-dev",
154-
"libncurses-dev",
155-
"libz3-dev",
156-
"pkg-config",
157-
"python3-lldb-13",
158-
"tzdata",
159-
"zlib1g-dev",
160-
]
161139
case "ubuntu2404":
162140
[
163141
"binutils",
@@ -252,8 +230,6 @@ public struct Linux: Platform {
252230
"apt-get"
253231
case "ubuntu2204":
254232
"apt-get"
255-
case "ubuntu2310":
256-
"apt-get"
257233
case "ubuntu2404":
258234
"apt-get"
259235
case "amazonlinux2":
@@ -627,7 +603,7 @@ public struct Linux: Platform {
627603
}
628604

629605
return PlatformDefinition.rhel9
630-
} else if let pd = [PlatformDefinition.ubuntu1804, .ubuntu2004, .ubuntu2204, .ubuntu2310, .ubuntu2404, .debian12, .fedora39].first(where: { $0.name == id + versionID }) {
606+
} else if let pd = [PlatformDefinition.ubuntu1804, .ubuntu2004, .ubuntu2204, .ubuntu2404, .debian12, .fedora39].first(where: { $0.name == id + versionID }) {
631607
return pd
632608
}
633609

Sources/SwiftlyCore/HTTPClient.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ struct SwiftOrgPlatform: Codable {
7272
PlatformDefinition.ubuntu2204
7373
case "Red Hat Universal Base Image 9":
7474
PlatformDefinition.rhel9
75-
case "Ubuntu 23.10":
76-
PlatformDefinition(name: "ubuntu2310", nameFull: "ubuntu23.10", namePretty: "Ubuntu 23.10")
7775
case "Ubuntu 24.04":
7876
PlatformDefinition(name: "ubuntu2404", nameFull: "ubuntu24.04", namePretty: "Ubuntu 24.04")
7977
case "Debian 12":

Sources/SwiftlyCore/Platform.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public struct PlatformDefinition: Codable, Equatable {
2424
public static let macOS = PlatformDefinition(name: "xcode", nameFull: "osx", namePretty: "macOS")
2525

2626
public static let ubuntu2404 = PlatformDefinition(name: "ubuntu2404", nameFull: "ubuntu24.04", namePretty: "Ubuntu 24.04")
27-
public static let ubuntu2310 = PlatformDefinition(name: "ubuntu2310", nameFull: "ubuntu23.10", namePretty: "Ubuntu 23.10")
2827
public static let ubuntu2204 = PlatformDefinition(name: "ubuntu2204", nameFull: "ubuntu22.04", namePretty: "Ubuntu 22.04")
2928
public static let ubuntu2004 = PlatformDefinition(name: "ubuntu2004", nameFull: "ubuntu20.04", namePretty: "Ubuntu 20.04")
3029
public static let ubuntu1804 = PlatformDefinition(name: "ubuntu1804", nameFull: "ubuntu18.04", namePretty: "Ubuntu 18.04")

Tests/SwiftlyTests/HTTPClientTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ final class HTTPClientTests: SwiftlyTests {
4949
let supportedPlatforms = [
5050
PlatformDefinition.macOS,
5151
PlatformDefinition.ubuntu2404,
52-
PlatformDefinition.ubuntu2310,
5352
PlatformDefinition.ubuntu2204,
5453
PlatformDefinition.ubuntu2004,
5554
// PlatformDefinition.ubuntu1804, // There are no releases for Ubuntu 18.04 in the branches being tested below
@@ -61,7 +60,6 @@ final class HTTPClientTests: SwiftlyTests {
6160

6261
let newPlatforms = [
6362
PlatformDefinition.ubuntu2404,
64-
PlatformDefinition.ubuntu2310,
6563
PlatformDefinition.fedora39,
6664
PlatformDefinition.debian12,
6765
]

docker/docker-compose.2310.yaml

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

0 commit comments

Comments
 (0)