From defae6309419f3a5eb68fadb8e16b54a309164f8 Mon Sep 17 00:00:00 2001
From: Yim Lee <yim_lee@apple.com>
Date: Mon, 22 Jan 2024 13:06:44 -0800
Subject: [PATCH 1/2] Add CI for Swift 5.10

---
 docker/docker-compose.2204.510.yaml | 17 +++++++++++++++++
 docker/docker-compose.2204.59.yaml  |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 docker/docker-compose.2204.510.yaml

diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
new file mode 100644
index 0000000..849bb13
--- /dev/null
+++ b/docker/docker-compose.2204.510.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-linux-backtrace:22.04-5.10
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.10-jammy"
+
+  test:
+    image: swift-linux-backtrace:22.04-5.10
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+
+  shell:
+    image: swift-linux-backtrace:22.04-5.10
diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml
index 7e1b1b6..27e93b6 100644
--- a/docker/docker-compose.2204.59.yaml
+++ b/docker/docker-compose.2204.59.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-linux-backtrace:22.04-5.9
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.9-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.9"
 
   test:
     image: swift-linux-backtrace:22.04-5.9

From adc931806e523e6b09f0948eae250ffa4d514d44 Mon Sep 17 00:00:00 2001
From: Yim Lee <yim_lee@apple.com>
Date: Mon, 22 Jan 2024 14:22:24 -0800
Subject: [PATCH 2/2] fix ruby version too old error

---
 docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ff03aec..3f6eec8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,8 +19,8 @@ RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools
 # ruby and jazzy for docs generation
 RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
 # jazzy no longer works on older version of ubuntu as ruby is too old.
-RUN if [ "${ubuntu_version}" = "focal" ] ; then echo "gem: --no-document" > ~/.gemrc ; fi
-RUN if [ "${ubuntu_version}" = "focal" ] ; then gem install jazzy ; fi
+RUN if [ "${ubuntu_version}" = "jammy" ] ; then echo "gem: --no-document" > ~/.gemrc ; fi
+RUN if [ "${ubuntu_version}" = "jammy" ] ; then gem install jazzy ; fi
 
 # tools
 RUN mkdir -p $HOME/.tools