Browse Source

Update builders. (#3712)

### Goals :soccer:
This PR updates the macOS, Linux, and Windows builders with more Swift
5.8 / Xcode 14.3 usage.
Jon Shier 2 years ago
parent
commit
d9551f7fb1
1 changed files with 24 additions and 36 deletions
  1. 24 36
      .github/workflows/ci.yml

+ 24 - 36
.github/workflows/ci.yml

@@ -75,9 +75,9 @@ jobs:
         run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire macOS" -destination "platform=macOS" -testPlan "${{ matrix.testPlan }}" clean test | xcpretty
   Catalyst:
     name: Test Catalyst
-    runs-on: macOS-12
+    runs-on: macOS-13
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
@@ -87,21 +87,21 @@ jobs:
         run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire iOS" -destination "platform=macOS" clean test | xcpretty
   Latest:
     name: Test Latest (iOS, tvOS, watchOS)
-    runs-on: macOS-12
+    runs-on: macOS-13
     env:
-      DEVELOPER_DIR: "/Applications/Xcode_14.2.app/Contents/Developer"
+      DEVELOPER_DIR: "/Applications/Xcode_14.3.app/Contents/Developer"
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
         include:
-          - destination: "OS=16.2,name=iPhone 14 Pro"
+          - destination: "OS=16.4,name=iPhone 14 Pro"
             name: "iOS"
             scheme: "Alamofire iOS"
-          - destination: "OS=16.1,name=Apple TV"
+          - destination: "OS=16.4,name=Apple TV"
             name: "tvOS"
             scheme: "Alamofire tvOS"
-          - destination: "OS=9.1,name=Apple Watch Series 8 (45mm)"
+          - destination: "OS=9.4,name=Apple Watch Series 8 (45mm)"
             name: "watchOS"
             scheme: "Alamofire watchOS"
     steps:
@@ -232,15 +232,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: swift:5.7.3-focal
-          - image: swift:5.7.3-centos7
-          - image: swift:5.7.3-amazonlinux2
+          - image: swift:5.8.0-focal
+          - image: swift:5.8.0-jammy
+          - image: swift:5.8.0-bionic
+          - image: swift:5.8.0-centos7
+          - image: swift:5.8.0-amazonlinux2
+          - image: swift:5.8.0-rhel-ubi9
           - image: swiftlang/swift:nightly-focal
           - image: swiftlang/swift:nightly-jammy
           - image: swiftlang/swift:nightly-amazonlinux2
-          - image: swiftlang/swift:nightly-5.8-focal
-          - image: swiftlang/swift:nightly-5.8-jammy
-          - image: swiftlang/swift:nightly-5.8-amazonlinux2
     container:
       image: ${{ matrix.image }}
     timeout-minutes: 10
@@ -250,33 +250,20 @@ jobs:
         run: swift build --build-tests -c debug
   Windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-latest
     timeout-minutes: 10
     steps:
-      - name: "Clone Project"
+      - name: Setup
+        uses: compnerd/gha-setup-swift@main
+        with:
+          branch: swift-5.8-release
+          tag: 5.8-RELEASE
+      - name: Clone
         uses: actions/checkout@v3
-      - uses: seanmiddleditch/gha-setup-vsdevenv@master
-      - name: Install Swift
-        run: |
-          Install-Binary -Url "https://download.swift.org/swift-5.6-release/windows10/swift-5.6-RELEASE/swift-5.6-RELEASE-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: SPM Windows build
+      - name: SPM Windows Build
         shell: cmd
         run: |
-          cd ${{ github.workspace}}
+          cd ${{ github.workspace }}
           set SDKROOT=%SystemDrive%\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk
           %SystemDrive%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin\swift-build.exe --build-tests -c debug -Xlinker /INCREMENTAL:NO -v
           if not exist .build\x86_64-unknown-windows-msvc\debug\Alamofire.swiftmodule exit 1
@@ -288,7 +275,8 @@ jobs:
       CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - name: Clone
+        uses: actions/checkout@v3
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with: