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

apple · Feb 11, 2023 · da2a404 · da2a404
1 parent f1e49d0
commit da2a404
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-cassandra-client:20.04-5.7
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.7-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.7"
 
   build:
     image: swift-cassandra-client:20.04-5.7

diff --git a/docker/docker-compose.2004.main.yaml → docker/docker-compose.2004.58.yaml b/docker/docker-compose.2004.main.yaml → docker/docker-compose.2004.58.yaml
@@ -3,19 +3,19 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        base_image: "swiftlang/swift:nightly-5.8-focal"
 
   build:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
 
   test:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
     environment: []
       #- SANITIZER_ARG: "--sanitize=thread"
       #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt"
 
   shell:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,21 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-cassandra-client:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  build:
+    image: swift-cassandra-client:22.04-main
+
+  test:
+    image: swift-cassandra-client:22.04-main
+    environment: []
+      #- SANITIZER_ARG: "--sanitize=thread"
+      #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt"
+
+  shell:
+    image: swift-cassandra-client:22.04-main