chore: refactor ci (#474)

supabase · Jul 23, 2024 · 9f15d2d · 9f15d2d
1 parent 4a2093d
commit 9f15d2d
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 171 deletions.
diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -24,22 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - macOS
-          - macOS,variant=Mac Catalyst
-          - iOS Simulator,name=iPhone 15 Pro
-          - tvOS Simulator,name=Apple TV
-          - watchOS Simulator,name=Apple Watch Series 9 (41mm)
-          - visionOS Simulator,name=Any visionOS Simulator Device
+        config:
+          - debug
+          - release
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
-        run: PLATFORM="${{ matrix.platform }}" SCHEME=Auth make test-library
+        run: CONFIG="${{ matrix.config }}" make test-auth
 
   test-linux:
     name: Test Auth (Linux)

diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
@@ -24,22 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - macOS
-          - macOS,variant=Mac Catalyst
-          - iOS Simulator,name=iPhone 15 Pro
-          - tvOS Simulator,name=Apple TV
-          - watchOS Simulator,name=Apple Watch Series 9 (41mm)
-          - visionOS Simulator,name=Any visionOS Simulator Device
+        config:
+          - debug
+          - release
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
-        run: PLATFORM="${{ matrix.platform }}" SCHEME=Functions make test-library
+        run: CONFIG="${{ matrix.config }}" make test-functions
   test-linux:
     name: Test Functions (Linux)
     strategy:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -19,8 +19,8 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
         run: make test-integration
         env:

diff --git a/.github/workflows/postgrest.yml b/.github/workflows/postgrest.yml
@@ -24,22 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - macOS
-          - macOS,variant=Mac Catalyst
-          - iOS Simulator,name=iPhone 15 Pro
-          - tvOS Simulator,name=Apple TV
-          - watchOS Simulator,name=Apple Watch Series 9 (41mm)
-          - visionOS Simulator,name=Any visionOS Simulator Device
+        config:
+          - debug
+          - release
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
-        run: PLATFORM="${{ matrix.platform }}" SCHEME=PostgREST make test-library
+        run: CONFIG="${{ matrix.config }}" make test-postgrest
   test-linux:
     name: Test Postgrest (Linux)
     strategy:

diff --git a/.github/workflows/realtime.yml b/.github/workflows/realtime.yml
@@ -24,22 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - macOS
-          - macOS,variant=Mac Catalyst
-          - iOS Simulator,name=iPhone 15 Pro
-          - tvOS Simulator,name=Apple TV
-          - watchOS Simulator,name=Apple Watch Series 9 (41mm)
-          - visionOS Simulator,name=Any visionOS Simulator Device
+        config:
+          - debug
+          - release
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
-        run: PLATFORM="${{ matrix.platform }}" SCHEME=Realtime make test-library
+        run: CONFIG="${{ matrix.config }}" make test-realtime
   test-linux:
     name: Test Realtime (Linux)
     strategy:

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -24,22 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - macOS
-          - macOS,variant=Mac Catalyst
-          - iOS Simulator,name=iPhone 15 Pro
-          - tvOS Simulator,name=Apple TV
-          - watchOS Simulator,name=Apple Watch Series 9 (41mm)
-          - visionOS Simulator,name=Any visionOS Simulator Device
+        config:
+          - debug
+          - release
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
-        run: PLATFORM="${{ matrix.platform }}" SCHEME=Storage make test-library
+        run: CONFIG="${{ matrix.config }}" make test-storage
   test-linux:
     name: Test Storage (Linux)
     strategy:

diff --git a/.github/workflows/supabase.yml b/.github/workflows/supabase.yml
@@ -24,22 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - macOS
-          - macOS,variant=Mac Catalyst
-          - iOS Simulator,name=iPhone 15 Pro
-          - tvOS Simulator,name=Apple TV
-          - watchOS Simulator,name=Apple Watch Series 9 (41mm)
-          - visionOS Simulator,name=Any visionOS Simulator Device
+        config:
+          - debug
+          - release
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Run tests
-        run: PLATFORM="${{ matrix.platform }}" SCHEME=Supabase make test-library
+        run: CONFIG="${{ matrix.config }}" make test-library
   test-linux:
     name: Test Supabase (Linux)
     strategy:

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Supabase.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Supabase.xcscheme
@@ -29,14 +29,11 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:TestPlans/AllTests.xctestplan"
+            reference = "container:TestPlans/Supabase.xctestplan"
             default = "YES">
          </TestPlanReference>
          <TestPlanReference
-            reference = "container:TestPlans/IntegrationTests.xctestplan">
-         </TestPlanReference>
-         <TestPlanReference
-            reference = "container:TestPlans/Supabase.xctestplan">
+            reference = "container:TestPlans/Integration.xctestplan">
          </TestPlanReference>
       </TestPlans>
    </TestAction>

diff --git a/Makefile b/Makefile
@@ -1,11 +1,13 @@
-PLATFORM_IOS = iOS Simulator,name=iPhone 15 Pro
+CONFIG = debug
+PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17.5,iPhone \d\+ Pro [^M])
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
-PLATFORM_TVOS = tvOS Simulator,name=Apple TV
-PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 9 (41mm)
+PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS 17.5,TV)
+PLATFORM_VISIONOS = visionOS Simulator,id=$(call udid_for,visionOS 1.2,Vision)
+PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS 10.5,Watch)
 
 SCHEME ?= Supabase
-PLATFORM ?= iOS Simulator,name=iPhone 15 Pro
+PLATFORM ?= $(PLATFORM_IOS)
 
 export SECRETS
 define SECRETS
@@ -22,31 +24,50 @@ load-env:
 dot-env:
 	@echo "$$SECRETS" > Tests/IntegrationTests/DotEnv.swift
 
-test-all: dot-env
-	set -o pipefail && \
-			xcodebuild test \
-				-skipMacroValidation \
-				-workspace supabase-swift.xcworkspace \
-				-scheme "$(SCHEME)" \
-				-testPlan AllTests \
-				-destination platform="$(PLATFORM)" | xcpretty
+
+build-all-platforms: 
+	for platform in "iOS" "macOS" "macOS,variant=Mac Catalyst" "tvOS" "visionOS" "watchOS"; do \
+		xcodebuild \
+			-skipMacroValidation \
+			-configuration "$(CONFIG)" \
+			-workspace Supabase.xcworkspace \
+			-scheme "$(SCHEME)" \
+			-testPlan AllTests \
+			-destination platform="$$platform" | xcpretty || exit 1; \
+	done
 
 test-library: dot-env
-	set -o pipefail && \
-			xcodebuild test \
-				-skipMacroValidation \
-				-workspace supabase-swift.xcworkspace \
-				-scheme "$(SCHEME)" \
-				-derivedDataPath /tmp/derived-data \
-				-destination platform="$(PLATFORM)" | xcpretty
+	for platform in "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_MAC_CATALYST)" "$(PLATFORM_TVOS)" "$(PLATFORM_VISIONOS)" "$(PLATFORM_WATCHOS)"; do \
+		xcodebuild test \
+			-skipMacroValidation \
+			-configuration "$(CONFIG)" \
+			-workspace Supabase.xcworkspace \
+			-scheme "$(SCHEME)" \
+			-destination platform="$$platform" | xcpretty || exit 1; \
+	done
+
+test-auth:
+	$(MAKE) SCHEME=Auth test-library
+
+test-functions:
+	$(MAKE) SCHEME=Functions test-library
+
+test-postgrest:
+	$(MAKE) SCHEME=PostgREST test-library
+
+test-realtime:
+	$(MAKE) SCHEME=Realtime test-library
+
+test-storage:
+	$(MAKE) SCHEME=Storage test-library
 
 test-integration: dot-env
 	set -o pipefail && \
 		xcodebuild test \
 			-skipMacroValidation \
-			-workspace supabase-swift.xcworkspace \
+			-workspace Supabase.xcworkspace \
 			-scheme Supabase \
-			-testPlan IntegrationTests \
+			-testPlan Integration \
 			-destination platform="$(PLATFORM_IOS)" | xcpretty
 
 
@@ -80,7 +101,7 @@ build-examples:
 		set -o pipefail && \
 			xcodebuild build \
 				-skipMacroValidation \
-				-workspace supabase-swift.xcworkspace \
+				-workspace Supabase.xcworkspace \
 				-scheme "$$scheme" \
 				-destination platform="$(PLATFORM_IOS)" | xcpretty; \
 	done
@@ -89,3 +110,7 @@ format:
 	@swiftformat .
 
 .PHONY: test-library test-linux build-example format
+
+define udid_for
+$(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')
+endef
diff --git a/Package.resolved b/Package.resolved
@@ -23,8 +23,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump",
       "state" : {
-        "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
-        "version" : "1.3.0"
+        "revision" : "d237304f42af07f22563aa4cc2d7e2cfb25da82e",
+        "version" : "1.3.1"
+      }
+    },
+    {
+      "identity" : "swift-issue-reporting",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-issue-reporting",
+      "state" : {
+        "revision" : "c85092304cda8cb38d2d68454b29609a8013620b",
+        "version" : "1.2.1"
       }
     },
     {
@@ -41,17 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
-        "version" : "510.0.2"
-      }
-    },
-    {
-      "identity" : "xctest-dynamic-overlay",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
-      "state" : {
-        "revision" : "6f30bdba373bbd7fbfe241dddd732651f2fbd1e2",
-        "version" : "1.1.2"
+        "revision" : "4c6cc0a3b9e8f14b3ae2307c5ccae4de6167ac2c",
+        "version" : "600.0.0-prerelease-2024-06-12"
       }
     }
   ],