Add CI for Swift 5.8 and update nightly to Ubuntu 22.04 (#121)

apple · Jan 24, 2023 · cbfde65 · cbfde65
1 parent 9b39d81
commit cbfde65
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-metrics:20.04-5.7
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.7"
 
   test:
     image: swift-metrics:20.04-5.7

diff --git a/docker/docker-compose.2004.58.yaml b/docker/docker-compose.2004.58.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-5.8
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.8-focal"
+
+  test:
+    image: swift-metrics:20.04-5.8
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-5.8
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  test:
+    image: swift-metrics:22.04-main
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:22.04-main