From 9d1949970b45ad99bba940c0ea01cc6abab09f03 Mon Sep 17 00:00:00 2001 From: tom doron Date: Wed, 16 Mar 2022 20:11:55 -0700 Subject: [PATCH] ci update motivation: 5.6 is out changes: * use release version of 5.6 * add docker setup for 5.7 (using nightly for now) --- docker/docker-compose.2004.56.yaml | 2 +- docker/docker-compose.2004.57.yaml | 15 +++++++++++++++ docker/docker-compose.2004.main.yaml | 1 - 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 docker/docker-compose.2004.57.yaml diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml index c20ef37..7264bad 100644 --- a/docker/docker-compose.2004.56.yaml +++ b/docker/docker-compose.2004.56.yaml @@ -6,8 +6,8 @@ services: image: swift-nio-extras:20.04-5.6 build: args: - base_image: "swiftlang/swift:nightly-5.6-focal" ubuntu_version: "focal" + swift_version: "5.6" test: image: swift-nio-extras:20.04-5.6 diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml new file mode 100644 index 0000000..f1d25f3 --- /dev/null +++ b/docker/docker-compose.2004.57.yaml @@ -0,0 +1,15 @@ +version: "3" + +services: + + runtime-setup: + image: swift-nio-extras:20.04-5.7 + build: + args: + base_image: "swiftlang/swift:nightly-main-focal" + + test: + image: swift-nio-extras:20.04-5.7 + + shell: + image: swift-nio-extras:20.04-5.7 diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml index a94cca0..a2621e8 100644 --- a/docker/docker-compose.2004.main.yaml +++ b/docker/docker-compose.2004.main.yaml @@ -7,7 +7,6 @@ services: build: args: base_image: "swiftlang/swift:nightly-main-focal" - ubuntu_version: "focal" test: image: swift-nio-extras:20.04-main