From 19640c43bf027b208d8135217413e91b2e19aec4 Mon Sep 17 00:00:00 2001 From: tom doron Date: Wed, 16 Mar 2022 18:45:07 -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.55.yaml | 3 +-- docker/docker-compose.2004.56.yaml | 6 +++--- docker/docker-compose.2004.57.yaml | 17 +++++++++++++++++ docker/docker-compose.2004.main.yaml | 3 +-- 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 docker/docker-compose.2004.57.yaml diff --git a/docker/docker-compose.2004.55.yaml b/docker/docker-compose.2004.55.yaml index ecca60fdb..4d0a12ee7 100644 --- a/docker/docker-compose.2004.55.yaml +++ b/docker/docker-compose.2004.55.yaml @@ -1,14 +1,13 @@ version: "3" services: - + runtime-setup: image: async-http-client:20.04-5.5 build: args: ubuntu_version: "focal" swift_version: "5.5" - test: image: async-http-client:20.04-5.5 diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml index 6d7b66e9e..ed61267a9 100644 --- a/docker/docker-compose.2004.56.yaml +++ b/docker/docker-compose.2004.56.yaml @@ -1,13 +1,13 @@ version: "3" services: - + runtime-setup: image: async-http-client:20.04-5.6 build: args: - base_image: "swiftlang/swift:nightly-5.6-focal" - + ubuntu_version: "focal" + swift_version: "5.6" test: image: async-http-client: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 000000000..16c564482 --- /dev/null +++ b/docker/docker-compose.2004.57.yaml @@ -0,0 +1,17 @@ +version: "3" + +services: + + runtime-setup: + image: async-http-client:20.04-5.7 + build: + args: + base_image: "swiftlang/swift:nightly-main-focal" + + test: + image: async-http-client:20.04-5.7 + environment: [] + #- SANITIZER_ARG=--sanitize=thread + + shell: + image: async-http-client:20.04-5.7 diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml index 55715ab72..11c7517ba 100644 --- a/docker/docker-compose.2004.main.yaml +++ b/docker/docker-compose.2004.main.yaml @@ -1,13 +1,12 @@ version: "3" services: - + runtime-setup: image: async-http-client:20.04-main build: args: base_image: "swiftlang/swift:nightly-main-focal" - test: image: async-http-client:20.04-main