From 909c8687d57bf7cd4ca50aeb56f956edcf622061 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 23 Nov 2022 21:14:50 +0000 Subject: [PATCH] Test Linux against Swift 5.7 Currently only macOS supports 5.7.1 --- .github/workflows/__export-file-baseline-information.yml | 3 ++- .github/workflows/__multi-language-autodetect.yml | 3 ++- .github/workflows/__swift-autobuild.yml | 3 ++- .github/workflows/__swift-custom-build.yml | 3 ++- pr-checks/checks/export-file-baseline-information.yml | 3 ++- pr-checks/checks/multi-language-autodetect.yml | 3 ++- pr-checks/checks/swift-autobuild.yml | 3 ++- pr-checks/checks/swift-custom-build.yml | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 7ba7267648..b239cc56c3 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -43,7 +43,8 @@ jobs: with: version: ${{ matrix.version }} - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: runner.os != 'Windows' && matrix.version == 'cached' + # Windows doesn't support Swift, and only macOS latest and nightly-latest support Swift 5.7.1. + if: runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'cached') with: swift-version: '5.7' - uses: ./../action/init diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 9d72fa6a5a..b4db770a0d 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -66,7 +66,8 @@ jobs: with: go-version: ^1.13.1 - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: matrix.version == 'cached' + # Only macOS latest and nightly-latest support Swift 5.7.1 + if: runner.os == 'Linux' || matrix.version == 'cached' with: swift-version: '5.7' diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index a13078de98..b85b0a2113 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -43,7 +43,8 @@ jobs: with: version: ${{ matrix.version }} - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: matrix.version == 'cached' + # Only macOS latest and nightly-latest support Swift 5.7.1 + if: runner.os == 'Linux' || matrix.version == 'cached' with: swift-version: '5.7' - uses: ./../action/init diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 5a89ed5751..78124ae8f4 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -49,7 +49,8 @@ jobs: with: version: ${{ matrix.version }} - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: matrix.version == 'cached' + # Only macOS latest and nightly-latest support Swift 5.7.1 + if: runner.os == 'Linux' || matrix.version == 'cached' with: swift-version: '5.7' - uses: ./../action/init diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index 86d8ef8e6e..43b859c3bb 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -3,7 +3,8 @@ description: "Tests that file baseline information is exported when the feature versions: ["nightly-latest"] steps: - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: runner.os != 'Windows' && matrix.version == 'cached' + # Windows doesn't support Swift, and only macOS latest and nightly-latest support Swift 5.7.1. + if: runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'cached') with: swift-version: "5.7" - uses: ./../action/init diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index db5a47c8b6..591df52239 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -5,7 +5,8 @@ env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA. steps: - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: matrix.version == 'cached' + # Only macOS latest and nightly-latest support Swift 5.7.1 + if: runner.os == 'Linux' || matrix.version == 'cached' with: swift-version: "5.7" diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml index 16dc25853b..a9efe76860 100644 --- a/pr-checks/checks/swift-autobuild.yml +++ b/pr-checks/checks/swift-autobuild.yml @@ -7,7 +7,8 @@ env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" steps: - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: matrix.version == 'cached' + # Only macOS latest and nightly-latest support Swift 5.7.1 + if: runner.os == 'Linux' || matrix.version == 'cached' with: swift-version: "5.7" - uses: ./../action/init diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml index 3dc0060c7e..9780bde51a 100644 --- a/pr-checks/checks/swift-custom-build.yml +++ b/pr-checks/checks/swift-custom-build.yml @@ -7,7 +7,8 @@ env: DOTNET_GENERATE_ASPNET_CERTIFICATE: "false" steps: - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9 - if: matrix.version == 'cached' + # Only macOS latest and nightly-latest support Swift 5.7.1 + if: runner.os == 'Linux' || matrix.version == 'cached' with: swift-version: "5.7" - uses: ./../action/init