From 630e66714ace9955a9d27a594b358b1f3a7c9a0f Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Thu, 17 Mar 2022 07:27:40 +0000 Subject: [PATCH 1/2] Move CI to 5.6 main and add 5.7 5.7 currently uses main, we'll update it when we get a branch for it. --- docker/docker-compose.2004.56.yaml | 2 +- docker/docker-compose.2004.57.yaml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) 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 8eb2807..fe21b9f 100644 --- a/docker/docker-compose.2004.56.yaml +++ b/docker/docker-compose.2004.56.yaml @@ -6,8 +6,8 @@ services: image: swift-http-structured-headers:20.04-5.6 build: args: - base_image: "swiftlang/swift:nightly-5.6-focal" ubuntu_version: "focal" + swift_version: "5.6" unit-tests: image: swift-http-structured-headers: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..1f65c2e --- /dev/null +++ b/docker/docker-compose.2004.57.yaml @@ -0,0 +1,20 @@ +version: "3" + +services: + + runtime-setup: + image: swift-http-structured-headers:20.04-5.7 + build: + args: + base_image: "swiftlang/swift:nightly-main-focal" + ubuntu_version: "focal" + + unit-tests: + image: swift-http-structured-headers:20.04-5.7 + + test: + image: swift-http-structured-headers:20.04-5.7 + + shell: + image: swift-http-structured-headers:20.04-5.7 + From a745fe121e47624c77637bd24a970f3da09bcecc Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Fri, 18 Mar 2022 07:17:03 +0000 Subject: [PATCH 2/2] Remove ubuntu_version --- docker/docker-compose.2004.57.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml index 1f65c2e..de99e30 100644 --- a/docker/docker-compose.2004.57.yaml +++ b/docker/docker-compose.2004.57.yaml @@ -7,7 +7,6 @@ services: build: args: base_image: "swiftlang/swift:nightly-main-focal" - ubuntu_version: "focal" unit-tests: image: swift-http-structured-headers:20.04-5.7