From d4a4a3568a0bc72d72268c92cc360b4055c884f9 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 21 Mar 2024 15:31:57 -0700 Subject: [PATCH] Try the Swiftylab swift setup action again. From the docs it looks pretty robust. --- .github/workflows/build-and-test.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5af51c8..2021ad4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -23,23 +23,14 @@ jobs: with: show-progress: false - - name: 'Set up swift (*nix)' - if: ${{ matrix.os != 'windows-latest' }} - uses: swift-actions/setup-swift@v1 + - name: 'Set up swift' + uses: SwiftyLab/setup-swift@latest with: swift-version: ${{ env.swift-version }} - - uses: compnerd/gha-setup-vsdevenv@main - - - name: Set up swift (Windows) - if: ${{ matrix.os == 'windows-latest' }} - uses: compnerd/gha-setup-swift@v0.2.1 - with: - branch: swift-${{ env.swift-version }}-release - tag: ${{ env.swift-version }}-RELEASE - - name: Verify swift version - run: ${{ matrix.os == 'macos-13' && 'xcrun' || '' }} swift --version + run: swift --version && swift --version | grep -q ${{ env.swift-version }} + shell: bash - uses: seanmiddleditch/gha-setup-ninja@v4 with: