From 6ab6671375a0983d25fb0b34be3c08b8b7d65fc3 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:09:38 -0600 Subject: [PATCH 1/7] Cut back on number of CI jobs --- .github/workflows/test.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccf4b474..0dd2eee3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,9 +9,8 @@ jobs: swiftver: - swift:5.2 - swift:5.3 - - swift:5.4 - swift:5.5 - - swiftlang/swift:nightly-main + - swiftlang/swift:5.6-main swiftos: - focal container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} @@ -36,21 +35,19 @@ jobs: strategy: fail-fast: false matrix: - dbimage: - - postgres:14 - - postgres:13 - - postgres:12 - - postgres:11 - dbauth: - - trust - - md5 - - scram-sha-256 swiftver: # Only test latest Swift for integration tests, issues from older Swift versions that don't show # up in the unit tests are fairly unlikely. - swift:5.5 swiftos: - focal + include: + - dbimage: postgres:14 + dbauth: scram-sha-256 + - dbimage: postgres:13 + dbauth: md5 + - dbimage: postgres:11 + dbauth: trust container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} runs-on: ubuntu-latest env: @@ -119,7 +116,7 @@ jobs: - scram-sha-256 xcode: - latest-stable - - latest + #- latest runs-on: macos-11 env: LOG_LEVEL: debug From 71335c39d6b438902eb5f033db61643fd4b09a85 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:11:49 -0600 Subject: [PATCH 2/7] Typo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dd2eee3..02bf0572 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - swift:5.2 - swift:5.3 - swift:5.5 - - swiftlang/swift:5.6-main + - swiftlang/swift:5.6-nightly-main swiftos: - focal container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} From 09190eb6bc616183f2e3fe835ce45b509c8b57b6 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:12:15 -0600 Subject: [PATCH 3/7] typo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02bf0572..f313d0f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - swift:5.2 - swift:5.3 - swift:5.5 - - swiftlang/swift:5.6-nightly-main + - swiftlang/swift:5.6-nightly-focal swiftos: - focal container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} From 5aad1e257142927ff6824b4c08fb9558a92d727c Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:14:48 -0600 Subject: [PATCH 4/7] ty.po. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f313d0f2..c1f82fe7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - swift:5.2 - swift:5.3 - swift:5.5 - - swiftlang/swift:5.6-nightly-focal + - swiftlang/swift:5.6-nightly swiftos: - focal container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} From b5ab83143e0ee4bba567cf07967d52b1a2aee686 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:16:00 -0600 Subject: [PATCH 5/7] typo... --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c1f82fe7..aa187651 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - swift:5.2 - swift:5.3 - swift:5.5 - - swiftlang/swift:5.6-nightly + - swiftlang/swift:nightly-5.6 swiftos: - focal container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} From fb399fa77043b11d30adb0a55b803ed7da75c44f Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:20:20 -0600 Subject: [PATCH 6/7] put nightly-main back --- .github/workflows/test.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa187651..6c1b3cdb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,6 +11,7 @@ jobs: - swift:5.3 - swift:5.5 - swiftlang/swift:nightly-5.6 + - swiftlang/swift:nightly-main swiftos: - focal container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} @@ -42,11 +43,14 @@ jobs: swiftos: - focal include: - - dbimage: postgres:14 + - swiftver: swift:5.5 + dbimage: postgres:14 dbauth: scram-sha-256 - - dbimage: postgres:13 + - swiftver: swift:5.5 + dbimage: postgres:13 dbauth: md5 - - dbimage: postgres:11 + - swiftver: swift:5.5 + dbimage: postgres:11 dbauth: trust container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} runs-on: ubuntu-latest From 6f67edd59f75ca0e6f5e20539e7d6057cb9f2767 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Thu, 17 Feb 2022 17:23:24 -0600 Subject: [PATCH 7/7] Darn matrix --- .github/workflows/test.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6c1b3cdb..79021623 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,23 +36,18 @@ jobs: strategy: fail-fast: false matrix: - swiftver: - # Only test latest Swift for integration tests, issues from older Swift versions that don't show - # up in the unit tests are fairly unlikely. - - swift:5.5 - swiftos: - - focal + dbimage: + - postgres:14 + - postgres:13 + - postgres:11 include: - - swiftver: swift:5.5 - dbimage: postgres:14 + - dbimage: postgres:14 dbauth: scram-sha-256 - - swiftver: swift:5.5 - dbimage: postgres:13 + - dbimage: postgres:13 dbauth: md5 - - swiftver: swift:5.5 - dbimage: postgres:11 + - dbimage: postgres:11 dbauth: trust - container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }} + container: swift:5.5-focal runs-on: ubuntu-latest env: LOG_LEVEL: debug