Update CI for Swift 5.5 (#9)

* Update CI for Swift 5.5

* Windows Swift installer does most of the work now

* Test discovery flag was still required for Swift 5.3

* Use correct Windows flow

Author: gwynne

.github/workflows/test.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-  pull_request: {}
+  pull_request:
 
 jobs:
   appleos:
@@ -12,7 +12,7 @@ jobs:
       matrix:
         xcode:
           - latest
-          #- latest-stable
+          - latest-stable
         destination:
           - 'platform=macOS,arch=x86_64'
           #- 'platform=macOS,arch=arm64'
@@ -31,14 +31,14 @@ jobs:
       run: xcodebuild test -scheme StructuredAPIClient-Package -enableThreadSanitizer YES -destination '${{ matrix.destination }}'
 
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ver:
           - swift:5.3
-          - swiftlang/swift:nightly-5.3
-          - swiftlang/swift:nightly-5.4
+          - swift:5.4
+          - swift:5.5
           - swiftlang/swift:nightly-main
         os:
           - bionic
@@ -55,26 +55,12 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-      - name: Setup VS dev env
-        uses: seanmiddleditch/gha-setup-vsdevenv@master
-      - name: Install Swift snapshot
-        run: |
-          Install-Binary -Url "https://swift.org/builds/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2021-02-18-a/swift-DEVELOPMENT-SNAPSHOT-2021-02-18-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
-      - name: Set Environment Variables
-        run: |
-          echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      - name: Adjust Paths
-        run: |
-          echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: Install Supporting Files
-        run: |
-          Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap"
-          Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap"
-          Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes"
-          Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap"
+      - name: Install Swift toolchain
+        uses: compnerd/gha-setup-swift@main
+        with:
+          branch: swift-5.5-release
+          tag: 5.5-RELEASE
       - name: Checkout
         uses: actions/checkout@v2
       - name: Run tests
-        run: swift test --enable-test-discovery
+        run: swift test