From cbfab6163cfd0154cb99589f882e4b1150f69aad Mon Sep 17 00:00:00 2001
From: David Nadoba <d_nadoba@apple.com>
Date: Wed, 18 Jan 2023 08:15:41 +0100
Subject: [PATCH] Add Swift 5.8 CI and update nightly CI to Ubuntu 22.04 (#167)

---
 docker/docker-compose.2004.main.yaml | 16 ----------------
 docker/docker-compose.2204.58.yaml   | 16 ++++++++++++++++
 docker/docker-compose.2204.main.yaml | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 16 deletions(-)
 delete mode 100644 docker/docker-compose.2004.main.yaml
 create mode 100644 docker/docker-compose.2204.58.yaml
 create mode 100644 docker/docker-compose.2204.main.yaml

diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
deleted file mode 100644
index a6e1a6d..0000000
--- a/docker/docker-compose.2004.main.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-nio-transport-services:20.04-main
-    build:
-      args:
-        ubuntu_version: "focal"
-        base_image: "swiftlang/swift:nightly-main-focal"
-
-  test:
-    image: swift-nio-transport-services:20.04-main
-
-  shell:
-    image: swift-nio-transport-services:20.04-main
diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml
new file mode 100644
index 0000000..c5b78a7
--- /dev/null
+++ b/docker/docker-compose.2204.58.yaml
@@ -0,0 +1,16 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-nio-transport-services:22.04-5.8
+    build:
+      args:
+        ubuntu_version: "jammy"
+        base_image: "swiftlang/swift:nightly-5.8-jammy"
+
+  test:
+    image: swift-nio-transport-services:22.04-5.8
+
+  shell:
+    image: swift-nio-transport-services:22.04-5.8
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
new file mode 100644
index 0000000..18ed8f6
--- /dev/null
+++ b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,16 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-nio-transport-services:22.04-main
+    build:
+      args:
+        ubuntu_version: "jammy"
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  test:
+    image: swift-nio-transport-services:22.04-main
+
+  shell:
+    image: swift-nio-transport-services:22.04-main