From 94ae5347ba78b335839adaf8ed7344d5a6c3b8a6 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Sat, 9 Mar 2024 23:01:39 +0800 Subject: [PATCH 1/3] Upgrade the github-ci to macOS 14 --- .github/workflows/CI.yml | 113 +++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 52 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0f5e54a3..938cccf7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,18 +14,24 @@ permissions: jobs: Pods: name: Cocoapods Lint - runs-on: macos-13 + runs-on: macos-14 env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app + DEVELOPER_DIR: /Applications/Xcode_15.2.app steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Cocoapods run: gem install cocoapods --no-document --quiet - name: Install Xcpretty run: gem install xcpretty --no-document --quiet + + - name: Pod Update + run: pod repo update --silent + + - name: Pod Install + run: pod install - name: Run SDWebImageSwiftUI podspec lint run: | @@ -34,24 +40,23 @@ jobs: Demo: name: Run Demo - runs-on: macos-13 + runs-on: macos-14 env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app + DEVELOPER_DIR: /Applications/Xcode_15.2.app WORKSPACE_NAME: SDWebImageSwiftUI.xcworkspace OSXSCHEME: SDWebImageSwiftUIDemo-macOS iOSSCHEME: SDWebImageSwiftUIDemo TVSCHEME: SDWebImageSwiftUIDemo-tvOS WATCHSCHEME: SDWebImageSwiftUIDemo-watchOS WatchKit App - strategy: - matrix: - iosDestination: ["platform=iOS Simulator,name=iPhone 14 Pro"] - tvOSDestination: ["platform=tvOS Simulator,name=Apple TV"] - watchOSDestination: ["platform=watchOS Simulator,name=Apple Watch Series 8 (45mm)"] - macOSDestination: ["platform=macOS"] - macCatalystDestination: ["platform=macOS,variant=Mac Catalyst"] + iosDestination: platform=iOS Simulator,name=iPhone 15 Pro + macOSDestination: platform=macOS,arch=x86_64 + macCatalystDestination: platform=macOS,arch=x86_64,variant=Mac Catalyst + tvOSDestination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation) + watchOSDestination: platform=watchOS Simulator,name=Apple Watch Series 9 (45mm) + visionOSDestination: platform=visionOS Simulator,name=Apple Vision Pro steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Clean DerivedData run: | @@ -73,46 +78,58 @@ jobs: - name: Run demo for OSX run: | set -o pipefail - xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.OSXSCHEME }}" -destination "${{ matrix.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c + xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.OSXSCHEME }}" -destination "${{ env.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c - name: Run demo for iOS run: | set -o pipefail - xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.iOSSCHEME }}" -destination "${{ matrix.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c + xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.iOSSCHEME }}" -destination "${{ env.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c - name: Run demo for TV run: | set -o pipefail - xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.TVSCHEME }}" -destination "${{ matrix.tvOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c + xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.TVSCHEME }}" -destination "${{ env.tvOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c - name: Run demo for Watch run: | set -o pipefail - xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.WATCHSCHEME }}" -destination "${{ matrix.watchOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c + xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.WATCHSCHEME }}" -destination "${{ env.watchOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c Test: name: Unit Test - runs-on: macos-13 + runs-on: macos-14 env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app + DEVELOPER_DIR: /Applications/Xcode_15.2.app WORKSPACE_NAME: SDWebImageSwiftUI.xcworkspace - OSXSCHEME: SDWebImageSwiftUITests macOS - iOSSCHEME: SDWebImageSwiftUITests - TVSCHEME: SDWebImageSwiftUITests tvOS + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + # use matrix to generate jobs for each platform strategy: + fail-fast: false matrix: - iosDestination: ["platform=iOS Simulator,name=iPhone 14 Pro"] - macOSDestination: ["platform=macOS"] - tvOSDestination: ["platform=tvOS Simulator,name=Apple TV"] + platform: [iOS, macOS, tvOS] + include: + - platform: iOS + destination: platform=iOS Simulator,name=iPhone 15 Pro + scheme: SDWebImageSwiftUITests + flag: ios + - platform: macOS + destination: platform=macOS,arch=x86_64 + scheme: SDWebImageSwiftUITests macOS + flag: macos + - platform: tvOS + destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation) + scheme: SDWebImageSwiftUITests tvOS + flag: tvos + # - platform: visionOS + # destination: platform=visionOS Simulator,name=Apple Vision Pro + # scheme: Vision + # flag: visionos steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 + with: + fetch-depth: 0 - - name: Clean DerivedData - run: | - rm -rf ~/Library/Developer/Xcode/DerivedData/ - mkdir DerivedData - - name: Install Cocoapods run: gem install cocoapods --no-document --quiet @@ -124,39 +141,31 @@ jobs: - name: Pod Install run: pod install - - - name: Test - ${{ matrix.iosDestination }} - run: | - set -o pipefail - xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.iOSSCHEME }}" -destination "${{ matrix.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c - mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS - - - name: Test - ${{ matrix.macOSDestination }} + + - name: Clean DerivedData run: | - set -o pipefail - xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.OSXSCHEME }}" -destination "${{ matrix.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO - mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/macOS - - - name: Test - ${{ matrix.tvOSDestination }} + rm -rf ~/Library/Developer/Xcode/DerivedData/ + mkdir DerivedData + + - name: Run test run: | set -o pipefail - xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.TVSCHEME }}" -destination "${{ matrix.tvOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c - mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/tvOS + xcodebuild build-for-testing -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c + xcodebuild test-without-building -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO + mv ~/Library/Developer/Xcode/DerivedData/ "./DerivedData/${{ matrix.platform }}" - name: Code Coverage run: | set -o pipefail export PATH="/usr/local/opt/curl/bin:$PATH" curl --version - bash <(curl -s https://codecov.io/bash) -D './DerivedData/macOS' -J '^SDWebImageSwiftUI$' -c -X gcov -F macos - bash <(curl -s https://codecov.io/bash) -D './DerivedData/iOS' -J '^SDWebImageSwiftUI$' -c -X gcov -F ios - bash <(curl -s https://codecov.io/bash) -D './DerivedData/tvOS' -J '^SDWebImageSwiftUI$' -c -X gcov -F tvos + bash <(curl -s https://codecov.io/bash) -v -D "./DerivedData/${{ matrix.platform }}" -J '^SDWebImageSwiftUI$' -c -X gcov -F "${{ matrix.flag }}" Build: name: Build Library - runs-on: macos-13 + runs-on: macos-14 env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app + DEVELOPER_DIR: /Applications/Xcode_15.2.app PROJECT_NAME: SDWebImageSwiftUI.xcodeproj OSXSCHEME: SDWebImageSwiftUI macOS iOSSCHEME: SDWebImageSwiftUI @@ -164,7 +173,7 @@ jobs: WATCHSCHEME: SDWebImageSwiftUI watchOS steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build the SwiftPM run: | From 24c18bf4030fcbab56869066d7ccf5d935026ebd Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Sat, 9 Mar 2024 23:06:29 +0800 Subject: [PATCH 2/3] Workaround the 32bit target on Xcode 15.2 --- Podfile | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 3bfde544..e7e7ce47 100644 --- a/Podfile +++ b/Podfile @@ -59,4 +59,27 @@ target 'SDWebImageSwiftUITests tvOS' do project test_project_path platform :tvos, '14.0' all_test_pods -end \ No newline at end of file +end + + +# Inject macro during SDWebImage Demo and Tests +post_install do |installer_representation| + installer_representation.pods_project.targets.each do |target| + if target.product_name == 'SDWebImage' + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) SD_CHECK_CGIMAGE_RETAIN_SOURCE=1' + end + elsif target.product_name == 'SDWebImageSwiftUI' + # Do nothing + else + target.build_configurations.each do |config| + # Override the min deployment target for some test specs to workaround `libarclite.a` missing issue + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' + config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.11' + config.build_settings['TVOS_DEPLOYMENT_TARGET'] = '9.0' + config.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = '2.0' + config.build_settings['XROS_DEPLOYMENT_TARGET'] = '1.0' + end + end + end +end From fbfd18664c16b0a1b43ce62f2244b4116e99a615 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Sat, 9 Mar 2024 23:15:00 +0800 Subject: [PATCH 3/3] Update the github-ci with visionOS --- .github/workflows/CI.yml | 4 +++- Tests/ImageManagerTests.swift | 2 +- Tests/WebImageTests.swift | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 938cccf7..47f6dd7a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -171,6 +171,7 @@ jobs: iOSSCHEME: SDWebImageSwiftUI TVSCHEME: SDWebImageSwiftUI tvOS WATCHSCHEME: SDWebImageSwiftUI watchOS + VISIONOSSCHEME: SDWebImageSwiftUI visionOS steps: - name: Checkout uses: actions/checkout@v3 @@ -185,7 +186,7 @@ jobs: run: brew install carthage - name: Carthage Update - run: ./carthage.sh update --platform "iOS, tvOS, macOS, watchOS" + run: ./carthage.sh update --platform "iOS, tvOS, macOS, watchOS, visionOS" - name: Build as dynamic frameworks run: | @@ -194,3 +195,4 @@ jobs: xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.iOSSCHEME }}" -sdk iphoneos -configuration Release | xcpretty -c xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.TVSCHEME }}" -sdk appletvos -configuration Release | xcpretty -c xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.WATCHSCHEME }}" -sdk watchos -configuration Release | xcpretty -c + xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.VISIONOSSCHEME }}" -sdk xros -configuration Release | xcpretty -c diff --git a/Tests/ImageManagerTests.swift b/Tests/ImageManagerTests.swift index ae3269b9..8222f5b2 100644 --- a/Tests/ImageManagerTests.swift +++ b/Tests/ImageManagerTests.swift @@ -17,7 +17,7 @@ class ImageManagerTests: XCTestCase { func testImageManager() throws { let expectation = self.expectation(description: "ImageManager usage with Combine") - let imageUrl = URL(string: "https://via.placeholder.com/500x500.jpg") + let imageUrl = URL(string: "https://placehold.co/500x500.jpg") let imageManager = ImageManager() imageManager.setOnSuccess { image, cacheType, data in XCTAssertNotNil(image) diff --git a/Tests/WebImageTests.swift b/Tests/WebImageTests.swift index bb2ae18c..2270dfa6 100644 --- a/Tests/WebImageTests.swift +++ b/Tests/WebImageTests.swift @@ -137,7 +137,7 @@ class WebImageTests: XCTestCase { func testWebImageOnSuccessWhenCacheMiss() throws { let expectation = self.expectation(description: "WebImage onSuccess when cache miss") - let imageUrl = URL(string: "http://via.placeholder.com/100x100.png") + let imageUrl = URL(string: "https://placehold.co/100x100.png") let cacheKey = SDWebImageManager.shared.cacheKey(for: imageUrl) SDImageCache.shared.removeImageFromMemory(forKey: cacheKey) SDImageCache.shared.removeImageFromDisk(forKey: cacheKey)