ci

Author: grdsdev

.github/workflows/ci.yml

@@ -100,9 +100,9 @@ jobs:
       - name: Update mtime for incremental builds
         uses: chetan/git-restore-mtime-action@v2
       - name: Examples
-        run: make SCHEME="Examples" build-example
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Examples" XCODEBUILD_ARGUMENT=build xcodebuild
       - name: SlackClone
-        run: make SCHEME="SlackClone" build-example
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SlackClone" XCODEBUILD_ARGUMENT=build xcodebuild
       - name: UserManagement
-        run: make SCHEME="UserManagement" build-example
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="UserManagement" XCODEBUILD_ARGUMENT=build xcodebuild
 

Makefile

@@ -1,12 +1,42 @@
-CONFIG = debug
-PLATFORM = iOS
+CONFIG = Debug
+
+DERIVED_DATA_PATH = ~/.derivedData/$(CONFIG)
+
 PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS,iPhone \d\+ Pro [^M])
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
 PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS,TV)
 PLATFORM_VISIONOS = visionOS Simulator,id=$(call udid_for,visionOS,Vision)
 PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS,Watch)
 
+
+PLATFORM = IOS
+DESTINATION = platform="$(PLATFORM_$(PLATFORM))"
+
+SCHEME = Supabase
+
+WORKSPACE = Supabase.xcworkspace
+
+XCODEBUILD_ARGUMENT = test
+
+XCODEBUILD_FLAGS = \
+	-configuration $(CONFIG) \
+	-derivedDataPath $(DERIVED_DATA_PATH) \
+	-destination $(DESTINATION) \
+	-scheme "$(SCHEME)" \
+	-skipMacroValidation \
+	-workspace $(WORKSPACE)
+
+XCODEBUILD_COMMAND = xcodebuild $(XCODEBUILD_ARGUMENT) $(XCODEBUILD_FLAGS)
+
+ifneq ($(strip $(shell which xcbeautify)),)
+	XCODEBUILD = set -o pipefail && $(XCODEBUILD_COMMAND) | xcbeautify --quiet
+else
+	XCODEBUILD = $(XCODEBUILD_COMMAND)
+endif
+
+TEST_RUNNER_CI = $(CI)
+
 export SECRETS
 define SECRETS
 enum DotEnv {
@@ -16,110 +46,17 @@ enum DotEnv {
 }
 endef
 
-default: test-all
-
-test-all:
-	$(MAKE) CONFIG=debug test-library
-	$(MAKE) CONFIG=release test-library
-
 xcodebuild:
-	if test "$(PLATFORM)" = "iOS"; \
-		then xcodebuild $(COMMAND) \
-			-skipMacroValidation \
-			-configuration $(CONFIG) \
-			-workspace Supabase.xcworkspace \
-			-scheme Supabase \
-			-destination platform="$(PLATFORM_IOS)" \
-			-derivedDataPath ~/.derivedData/$(CONFIG) | xcpretty; \
-		elif test "$(PLATFORM)" = "macOS"; \
-		then xcodebuild $(COMMAND) \
-			-skipMacroValidation \
-			-configuration $(CONFIG) \
-			-workspace Supabase.xcworkspace \
-			-scheme Supabase \
-			-destination platform="$(PLATFORM_MACOS)" \
-			-derivedDataPath ~/.derivedData/$(CONFIG) | xcpretty; \
-		elif test "$(PLATFORM)" = "tvOS"; \
-		then xcodebuild $(COMMAND) \
-			-skipMacroValidation \
-			-configuration $(CONFIG) \
-			-workspace Supabase.xcworkspace \
-			-scheme Supabase \
-			-destination platform="$(PLATFORM_TVOS)" \
-			-derivedDataPath ~/.derivedData/$(CONFIG) | xcpretty; \
-		elif test "$(PLATFORM)" = "watchOS"; \
-		then xcodebuild $(COMMAND) \
-			-skipMacroValidation \
-			-configuration $(CONFIG) \
-			-workspace Supabase.xcworkspace \
-			-scheme Supabase \
-			-destination platform="$(PLATFORM_WATCHOS)" \
-			-derivedDataPath ~/.derivedData/$(CONFIG) | xcpretty; \
-		elif test "$(PLATFORM)" = "visionOS"; \
-		then xcodebuild $(COMMAND) \
-			-skipMacroValidation \
-			-configuration $(CONFIG) \
-			-workspace Supabase.xcworkspace \
-			-scheme Supabase \
-			-destination platform="$(PLATFORM_VISIONOS)" \
-			-derivedDataPath ~/.derivedData/$(CONFIG) | xcpretty; \
-		elif test "$(PLATFORM)" = "macCatalyst"; \
-		then xcodebuild $(COMMAND) \
-			-skipMacroValidation \
-			-configuration $(CONFIG) \
-			-workspace Supabase.xcworkspace \
-			-scheme Supabase \
-			-destination platform="$(PLATFORM_MAC_CATALYST)" \
-			-derivedDataPath ~/.derivedData/$(CONFIG) | xcpretty; \
-		else exit 1; \
-		fi;	
+	$(XCODEBUILD)
 
 load-env:
 	@. ./scripts/load_env.sh
 
 dot-env:
 	@echo "$$SECRETS" > Tests/IntegrationTests/DotEnv.swift
 
-
-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-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.xcworkspace \
-			-scheme Supabase \
-			-testPlan Integration \
-			-destination platform="$(PLATFORM_IOS)" | xcpretty
-
-
-test-linux:
-	docker build -t supabase-swift .
-	docker run supabase-swift
+	$(MAKE) TEST_PLAN=Integration xcodebuild
 
 build-for-library-evolution:
 	swift build \
@@ -141,19 +78,10 @@ test-docs:
 		|| (echo "xcodebuild docbuild failed:\n\n$(DOC_WARNINGS)" | tr '\1' '\n' \
 		&& exit 1)
 
-build-example:
-	xcodebuild build \
-		-skipMacroValidation \
-		-workspace Supabase.xcworkspace \
-		-scheme "$(SCHEME)" \
-		-destination platform="$(PLATFORM_IOS)" \
-		-derivedDataPath ~/.derivedData | xcpretty;
-
-
 format:
 	@swift format -i -r --ignore-unparsable-files .
 
-.PHONY: test-library test-linux build-example
+.PHONY: build-for-library-evolution format xcodebuild test-docs test-integration
 
 define udid_for
 $(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')