trying to fix CI

dongyuwei · Sep 18, 2023 · aa5e710 · aa5e710
1 parent 53ad2a3
commit aa5e710
Show file tree

Hide file tree

Showing 12 changed files with 140 additions and 219 deletions.
diff --git a/.github/workflows/github-actions-ci.yml b/.github/workflows/github-actions-ci.yml
@@ -5,7 +5,5 @@ jobs:
     runs-on: macos-13
     steps:
       - uses: actions/checkout@v2
-      - name: Run tests
-        run: sh unit-tests.sh
-      - name: Build
-        run: sh build.sh
+      - name: Run tests and build App
+        run: sh ci-build-and-tests.sh
diff --git a/Podfile b/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.9'
+platform :osx, '13.5.2'
 
 use_frameworks!
 
@@ -8,7 +8,6 @@ target 'hallelujah' do
 end
 
 target 'Tests' do
-  pod "GCDWebServer", "~> 3.0"
   pod 'MDCDamerauLevenshtein', :git => 'https://github.com/modocache/MDCDamerauLevenshtein.git', :branch => 'master'
 end
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -26,6 +26,6 @@ SPEC CHECKSUMS:
   GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
   MDCDamerauLevenshtein: 973db4b240863f3c6b64f076ef2c27a73a8af0bf
 
-PODFILE CHECKSUM: c087b716605526acce882ddd38ba25ca256ad40c
+PODFILE CHECKSUM: 97aa7f494743e0815318a886fcba109e8ae99240
 
 COCOAPODS: 1.12.1
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests-acknowledgements.markdown b/Pods/Target Support Files/Pods-Tests/Pods-Tests-acknowledgements.markdown
diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests-acknowledgements.plist b/Pods/Target Support Files/Pods-Tests/Pods-Tests-acknowledgements.plist
diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh b/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh
diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig b/Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig
diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig b/Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig
diff --git a/ci-build-and-tests.sh b/ci-build-and-tests.sh
@@ -1,2 +1,6 @@
+rm Podfile.lock
+rm -rf Pods
+pod install
+
 sh build.sh
 sh unit-tests.sh
diff --git a/hallelujah.xcodeproj/project.pbxproj b/hallelujah.xcodeproj/project.pbxproj
@@ -359,12 +359,10 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework",
 				"${BUILT_PRODUCTS_DIR}/MDCDamerauLevenshtein/MDCDamerauLevenshtein.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MDCDamerauLevenshtein.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -527,7 +525,7 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = us.erlang.Tests;
@@ -572,7 +570,7 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = us.erlang.Tests;
@@ -599,7 +597,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/lib",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = github.dongyuwei.inputmethod.hallelujahInputMethod;
 				PRODUCT_NAME = hallelujah;
 				"USER_HEADER_SEARCH_PATHS[arch=*]" = "\"${PODS_ROOT}/\"/**";
@@ -623,7 +621,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/lib",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = github.dongyuwei.inputmethod.hallelujahInputMethod;
 				PRODUCT_NAME = hallelujah;