cleanup

amplitude · Nov 19, 2024 · 676e3b5 · 676e3b5
1 parent 442c879
commit 676e3b5
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 88 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,96 +34,77 @@ jobs:
         run: |
           sudo xcode-select -switch /Applications/Xcode_15.4.app
 
-      # - name: iOS Build 
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk iphonesimulator \
-      #       -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.5'
-
-      # - name: macOS Build 
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk macosx \
-      #       -destination 'platform=macosx' \
-
-      # - name: tvOS Build 
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk appletvsimulator \
-      #       -destination 'platform=tvOS Simulator,name=Apple TV' \
-
-      # - name: xrOS Build 
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk xrsimulator \
-      #       -destination 'platform=visionOS Simulator,name=Apple Vision Pro' \
-
-      # - name: iOS Tests
-      #   run: |
-      #     xcodebuild test \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk iphonesimulator \
-      #       -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.5'
-
-      # - name: macOS Tests
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk macosx \
-      #       -destination 'platform=macosx' \
-      #       test
-
-      # - name: tvOS Tests
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk appletvsimulator \
-      #       -destination 'platform=tvOS Simulator,name=Apple TV' \
-      #       test
-
-      # - name: visionOS Tests
-      #   run: |
-      #     xcodebuild \
-      #       -project AnalyticsConnector.xcodeproj \
-      #       -scheme AnalyticsConnector \
-      #       -sdk xrsimulator \
-      #       -destination 'platform=visionOS Simulator,name=Apple Vision Pro' \
-      #       test
-
-      - name: Show Installed Simulators
-        run: xcrun simctl list
-
-      # remove this step after update the os runner to 15
-      - name: Install visionOS simulator
-        run: xcodebuild -downloadPlatform visionOS
+      - name: iOS Build 
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk iphonesimulator \
+            -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.5'
 
-      - name: Show Installed Simulators
-        run: xcrun simctl list
-
-      - name: Show Installed Simulators
-        run: xcodebuild -showsdks
-
-      - name: Validate Podfile
-        run: pod --version
+      - name: macOS Build 
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk macosx \
+            -destination 'platform=macosx' \
 
-      # - name: Setup Cocoapods
-      #   uses: maxim-lobanov/[email protected]
-      #   with:
-      #     version: latest
+      - name: tvOS Build 
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk appletvsimulator \
+            -destination 'platform=tvOS Simulator,name=Apple TV' \
 
-      - name: Validate Podfile after reinstall
-        run: pod --version
+      - name: visionOS Build
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk xrsimulator \
+            -destination 'platform=visionOS Simulator,name=Apple Vision Pro' \
+
+      - name: iOS Tests
+        run: |
+          xcodebuild test \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk iphonesimulator \
+            -destination 'platform=iOS Simulator,name=iPhone 12,OS=15.5'
+
+      - name: macOS Tests
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk macosx \
+            -destination 'platform=macosx' \
+            test
+
+      - name: tvOS Tests
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk appletvsimulator \
+            -destination 'platform=tvOS Simulator,name=Apple TV' \
+            test
+
+      - name: visionOS Tests
+        run: |
+          xcodebuild \
+            -project AnalyticsConnector.xcodeproj \
+            -scheme AnalyticsConnector \
+            -sdk xrsimulator \
+            -destination 'platform=visionOS Simulator,name=Apple Vision Pro' \
+            test
+
+      # Install missing sdk for pod lint
+      # Remove this step after the runner upgraded to macos-15
+      - name: Install visionOS simulator
+        run: xcodebuild -downloadPlatform visionOS -quiet
 
       - name: Validate Podfile
         run: pod lib lint --allow-warnings

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
             -sdk appletvsimulator \
             -destination 'platform=tvOS Simulator,name=Apple TV' \
 
-      - name: xrOS Build 
+      - name: visionOS Build 
         run: |
           xcodebuild \
             -project AnalyticsConnector.xcodeproj \