From 52d7fd627f4b753b17d5943784bd7f99d99983f2 Mon Sep 17 00:00:00 2001
From: Marko Justinek <marko.justinek@gmail.com>
Date: Fri, 26 Apr 2024 15:26:02 +1000
Subject: [PATCH] ci: Pass github.workspace to reusable workflow

---
 .github/workflows/build_test.yml         |  3 ---
 .github/workflows/test_macos14_arm64.yml |  5 -----
 Support/build_test                       | 11 +----------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 0a6dcd8..2c7c52c 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -2,11 +2,8 @@ name: "Build and Test"
 
 on:
   pull_request:
-    branches:
-      - 'main'
   push:
     branches:
-      - 'main'
       - 'chore/**'
       - 'docs/**'
       - 'feat/**'
diff --git a/.github/workflows/test_macos14_arm64.yml b/.github/workflows/test_macos14_arm64.yml
index 63c71eb..635a8c4 100644
--- a/.github/workflows/test_macos14_arm64.yml
+++ b/.github/workflows/test_macos14_arm64.yml
@@ -70,9 +70,4 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.codecov_token }}
-          file: ".build/artifacts/${{ env.SCHEME }}-TestResultBundle.xcresult"
-          directory: ".build/artifacts"
-          fail_ci_if_error: true
-          flags: unittests
-          name: PactSwiftMockServer
           verbose: true
diff --git a/Support/build_test b/Support/build_test
index 0fb7b1d..fed7538 100755
--- a/Support/build_test
+++ b/Support/build_test
@@ -26,7 +26,6 @@ source "$SOURCE_DIR/utils.sh"
 
 # Properties
 SCHEME_TARGET_PAIRS=()
-BUILD_PATH="$SOURCE_DIR/../.build"
 
 ###############
 # "private"
@@ -78,14 +77,6 @@ fi
 for INDEX in "${SCHEME_TARGET_PAIRS[@]}"; do
   SCHEME="${INDEX%%:::*}"
   TARGET="${INDEX##*::}"
-  RESULT_BUNDLE_PATH="$BUILD_PATH/artifacts/$SCHEME-TestResultBundle.xcresult"
 
-  if [ $(folderExists "$RESULT_BUNDLE_PATH") == true ]; then
-    # Remove build data by previous runs
-    echo "ℹ️  Reoving results bundle from previous runs..."
-    executeCommand "rm -fr $RESULT_BUNDLE_PATH"
-  fi
-
-  echo "🧪  Running tests"
-  executeCommand "xcodebuild -project \"PactSwiftMockServer.xcodeproj\" -scheme \"$SCHEME\" -destination \"$TARGET\" -enableCodeCoverage YES -derivedDataPath \"$BUILD_PATH/DerivedData\" -resultBundlePath \"$RESULT_BUNDLE_PATH\" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES build test | xcbeautify"
+  executeCommand "xcodebuild -project \"PactSwiftMockServer.xcodeproj\" -scheme \"$SCHEME\" -destination \"$TARGET\" -enableCodeCoverage YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES build test | xcbeautify"
 done