CONFIG: Update GH to use macOS 15 (#213)

* CONFIG: Update GH to use macOS 15 * Update linux swift container * Fix tests for Linux * Fix lint error
adamayoung · Nov 5, 2024 · b16c263 · b16c263
1 parent 08a71c9
commit b16c263
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,12 +17,12 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
 
 jobs:
   build-test:
     name: Build and Test
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -52,7 +52,7 @@ jobs:
 
   build-and-test-platforms:
     name: Build and Test (${{ matrix.name }})
-    runs-on: macos-14
+    runs-on: macos-15
     continue-on-error: true
     strategy:
       matrix:
@@ -63,8 +63,8 @@ jobs:
             destination: platform=watchOS Simulator,name=Apple Watch Series 10 (46mm),OS=11.0
           - name: tvOS
             destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.0
-          # - name: visionOS
-          #   destination: platform=visionOS Simulator,name=Apple Vision Pro,OS=2.0
+          - name: visionOS
+            destination: platform=visionOS Simulator,name=Apple Vision Pro,OS=2.0
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -75,19 +75,19 @@ jobs:
       - name: Test
         run: set -o pipefail && NSUnbufferedIO=YES xcodebuild test-without-building -scheme TMDb -only-testing TMDbTests -destination '${{ matrix.destination }}'
 
-  # build-test-linux:
-  #   name: Build and Test (Linux)
-  #   runs-on: ubuntu-latest
-  #   container: swiftlang/swift:nightly-6.0-jammy
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
+  build-test-linux:
+    name: Build and Test (Linux)
+    runs-on: ubuntu-latest
+    container: swift:6.0.2-jammy
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-  #     - name: Build
-  #       run: swift build --build-tests -Xswiftc -warnings-as-errors
+      - name: Build
+        run: swift build --build-tests -Xswiftc -warnings-as-errors
 
-  #     - name: Test
-  #       run: swift test --skip-build --filter TMDbTests
+      - name: Test
+        run: swift test --skip-build --filter TMDbTests
 
-  #     - name: Build for Release
-  #       run: swift build -c release -Xswiftc -warnings-as-errors
+      - name: Build for Release
+        run: swift build -c release -Xswiftc -warnings-as-errors
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -17,12 +17,12 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 120
     permissions:
      actions: read

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -20,12 +20,12 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
 
 jobs:
   integration-test:
     name: Integration Test
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,9 +19,9 @@ concurrency:
 jobs:
   swiftLint:
     name: SwiftLint
-    runs-on: macos-14
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ WATCHOS_DESINTATION = 'platform=watchOS Simulator,name=Apple Watch Series 9 (45m
 TVOS_DESTINATION = 'platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.0'
 VISIONOS_DESTINATION = 'platform=visionOS Simulator,name=Apple Vision Pro,OS=2.0'
 
-SWIFT_CONTAINER_IMAGE = swiftlang/swift:nightly-6.0-jammy
+SWIFT_CONTAINER_IMAGE = swift:6.0.2-jammy
 
 .PHONY: clean
 clean:

diff --git a/Sources/TMDb/Networking/TMDbAPIClient.swift b/Sources/TMDb/Networking/TMDbAPIClient.swift
@@ -19,6 +19,10 @@
 
 import Foundation
 
+#if canImport(FoundationNetworking)
+    import FoundationNetworking
+#endif
+
 final class TMDbAPIClient: APIClient, Sendable {
 
     private let apiKey: String

diff --git a/Tests/TMDbTests/Adapters/URLSessionHTTPClientAdapterTests.swift b/Tests/TMDbTests/Adapters/URLSessionHTTPClientAdapterTests.swift
@@ -21,9 +21,22 @@ import Foundation
 import Testing
 @testable import TMDb
 
+#if canImport(FoundationNetworking)
+    import FoundationNetworking
+#endif
+
+private let isLinux = {
+    #if os(Linux)
+        return true
+    #else
+        return false
+    #endif
+}()
+
 @Suite(
     .serialized,
-    .tags(.adapter)
+    .tags(.adapter),
+    .disabled(if: isLinux)
 )
 final class URLSessionHTTPClientAdapterTests {
 

diff --git a/Tests/TMDbTests/Dom 6D4E ain/Models/MovieTests.swift b/Tests/TMDbTests/Dom 6D4E ain/Models/MovieTests.swift
@@ -64,7 +64,7 @@ extension MovieTests {
             backdropPath: URL(string: "/fCayJrkfRaCRCTh8GqN30f8oyQF.jpg"),
             budget: 63_000_000,
             revenue: 100_853_753,
-            homepageURL: URL(string: ""),
+            homepageURL: nil,
             imdbID: "tt0137523",
             status: .released,
             productionCompanies: [

diff --git a/Tests/TMDbTests/Domain/Models/ShowTests.swift b/Tests/TMDbTests/Domain/Models/ShowTests.swift
@@ -58,7 +58,7 @@ struct ShowTests {
         #expect(tvSeriesShow.date == expectedResult)
     }
 
-    @Test("JSON decoding of Movie", .tags(.decoding))
+    @Test("JSON decoding of Show", .tags(.decoding))
     func testDecodeReturnsMovie() throws {
         let result = try JSONDecoder.theMovieDatabase.decode(Show.self, fromResource: "show-movie")
 

diff --git a/Tests/TMDbTests/Networking/HTTPClient/MockURLProtocol.swift b/Tests/TMDbTests/Networking/HTTPClient/MockURLProtocol.swift
@@ -19,6 +19,10 @@
 
 import Foundation
 
+#if canImport(FoundationNetworking)
+    import FoundationNetworking
+#endif
+
 final class MockURLProtocol: URLProtocol, @unchecked Sendable {
 
     @MainActor static var data: Data?

diff --git a/Tests/TMDbTests/Networking/TMDbAPIClientTests.swift b/Tests/TMDbTests/Networking/TMDbAPIClientTests.swift
@@ -21,6 +21,10 @@ import Foundation
 import Testing
 @testable import TMDb
 
+#if canImport(FoundationNetworking)
+    import FoundationNetworking
+#endif
+
 @Suite(.tags(.networking))
 struct TMDbAPIClientTests {
 
@@ -59,7 +63,11 @@ struct TMDbAPIClientTests {
             error = err as? TMDbAPIError
         }
 
-        #expect(error == .invalidURL(path))
+        #if canImport(FoundationNetworking)
+            #expect(error == .unknown)
+        #else
+            #expect(error == .invalidURL(path))
+        #endif
     }
 
     @Test("perform has correct URL")