Use makefile with env vars for CI tests

adzerk · Mar 29, 2021 · 9160da5 · 9160da5
1 parent 6bfeb63
commit 9160da5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,9 @@ jobs:
         env:
           TEST_SDK: "${{ matrix.sdk }}"
           TEST_DEVICE: "${{ matrix.device }}"
-        run: ./.github/workflows/xcodebuild.sh clean build test
+        run: |
+          make
+          make test
       - name: "Verify code linting generated no changes"
         run: git diff --exit-code
       - name: Upload coverage to Codecov

diff --git a/.github/workflows/xcodebuild.sh b/.github/workflows/xcodebuild.sh
diff --git a/Makefile b/Makefile
@@ -1,6 +1,10 @@
-XCARGS := -workspace VelocidiSDK.xcworkspace \
-					-sdk "iphonesimulator" \
-					-destination "platform=iOS Simulator,OS=14.4,name=iPhone 11 Pro Max" \
+WORKSPACE ?= VelocidiSDK.xcworkspace
+TEST_SDK ?= 14.4
+TEST_DEVICE ?= iPhone 11 Pro Max
+
+XCARGS := -workspace $(WORKSPACE) \
+					-sdk "iphonesimulator$(TEST_SDK)" \
+					-destination "platform=iOS Simulator,OS=$(TEST_SDK),name=$(TEST_DEVICE)" \
 					GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
 
 all: clean build

diff --git a/VelocidiSDK.xcworkspace/contents.xcworkspacedata b/VelocidiSDK.xcworkspace/contents.xcworkspacedata