From ff25332d9ddbe02cd3bba1cd4bb6495a38c822a2 Mon Sep 17 00:00:00 2001 From: Nathan Harris Date: Sat, 1 Aug 2020 23:12:51 -0700 Subject: [PATCH] Add official Swift 5.2 releases for other Linux distros to CI --- .gitlab/ci/amazonlinux-2.yml | 4 ++++ .gitlab/ci/centos-8.yml | 4 ++++ .gitlab/ci/ubuntu-bionic.yml | 30 +++++++++++++++--------------- .gitlab/ci/ubuntu-focal.yml | 4 ++++ .gitlab/ci/ubuntu-xenial.yml | 34 +++++++++++++++++----------------- 5 files changed, 44 insertions(+), 32 deletions(-) diff --git a/.gitlab/ci/amazonlinux-2.yml b/.gitlab/ci/amazonlinux-2.yml index e79025c..4bd391a 100644 --- a/.gitlab/ci/amazonlinux-2.yml +++ b/.gitlab/ci/amazonlinux-2.yml @@ -4,3 +4,7 @@ swift trunk: extends: .unit-test image: swiftlang/swift:nightly-master-amazonlinux2 allow_failure: true + +swift 5.2: + extends: .unit-test + image: swift:5.2-amazonlinux2 diff --git a/.gitlab/ci/centos-8.yml b/.gitlab/ci/centos-8.yml index 3536f9d..e2e4f1c 100644 --- a/.gitlab/ci/centos-8.yml +++ b/.gitlab/ci/centos-8.yml @@ -4,3 +4,7 @@ swift trunk: extends: .unit-test image: swiftlang/swift:nightly-master-centos8 allow_failure: true + +swift 5.2: + extends: .unit-test + image: swift:5.2-centos8 diff --git a/.gitlab/ci/ubuntu-bionic.yml b/.gitlab/ci/ubuntu-bionic.yml index 2ffe5e1..c472d82 100644 --- a/.gitlab/ci/ubuntu-bionic.yml +++ b/.gitlab/ci/ubuntu-bionic.yml @@ -1,25 +1,25 @@ include: '/.gitlab/ci/test-template.yml' -swift 5.0: +swift trunk: extends: .unit-test - image: swift:5.0-bionic - variables: - SANITIZER_ARG: '' - -swift 5.1: - extends: .unit-test - image: swift:5.1-bionic - -swift 5.2: - extends: .unit-test - image: swift:5.2-bionic + image: swiftlang/swift:nightly-master-bionic + allow_failure: true swift 5.3: extends: .unit-test image: swiftlang/swift:nightly-5.3-bionic allow_failure: true -swift trunk: +swift 5.2: extends: .unit-test - image: swiftlang/swift:nightly-master-bionic - allow_failure: true + image: swift:5.2-bionic + +swift 5.1: + extends: .unit-test + image: swift:5.1-bionic + +swift 5.0: + extends: .unit-test + image: swift:5.0-bionic + variables: + SANITIZER_ARG: '' diff --git a/.gitlab/ci/ubuntu-focal.yml b/.gitlab/ci/ubuntu-focal.yml index 38180f2..4a69ed0 100644 --- a/.gitlab/ci/ubuntu-focal.yml +++ b/.gitlab/ci/ubuntu-focal.yml @@ -4,3 +4,7 @@ swift trunk: extends: .unit-test image: swiftlang/swift:nightly-master-focal allow_failure: true + +swift 5.2: + extends: .unit-test + image: swift:5.2-focal diff --git a/.gitlab/ci/ubuntu-xenial.yml b/.gitlab/ci/ubuntu-xenial.yml index d43caf1..d58034f 100644 --- a/.gitlab/ci/ubuntu-xenial.yml +++ b/.gitlab/ci/ubuntu-xenial.yml @@ -1,24 +1,24 @@ include: '/.gitlab/ci/test-template.yml' +swift trunk: + extends: .unit-test + image: swiftlang/swift:nightly-master-xenial + allow_failure: true + +swift 5.3: + extends: .unit-test + image: swiftlang/swift:nightly-5.3-xenial + +swift 5.2: + extends: .unit-test + image: swift:5.2-xenial + +swift 5.1: + extends: .unit-test + image: swift:5.1-xenial + swift 5.0: extends: .unit-test image: swift:5.0-xenial variables: SANITIZER_ARG: '' - -swift 5.1: - extends: .unit-test - image: swift:5.1-xenial - -swift 5.2: - extends: .unit-test - image: swift:5.2-xenial - -swift 5.3: - extends: .unit-test - image: swiftlang/swift:nightly-5.3-xenial - -swift trunk: - extends: .unit-test - image: swiftlang/swift:nightly-master-xenial - allow_failure: true