From 1cc34c240319b97c8b7cc4243f1f859244bebab6 Mon Sep 17 00:00:00 2001 From: Shin Yamamoto Date: Fri, 22 Jan 2021 00:10:52 +0900 Subject: [PATCH 1/3] ci: enable xcode12_3 job --- .github/workflows/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8bd751a..dc44d84 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,14 +41,14 @@ jobs: CERTS_PASS: ${{ secrets.CERTS_PASS }} DECORD_KEY: ${{ secrets.DECORD_KEY }} -# xcode12_3: -# runs-on: macOS-latest -# steps: -# - uses: actions/checkout@v1 -# - name: "Testing on Xcode 12.3" -# run: test/travis_ci.sh -# env: -# DEVELOPER_DIR: /Applications/Xcode_12.3.app -# CERTS_PASS: ${{ secrets.CERTS_PASS }} -# DECORD_KEY: ${{ secrets.DECORD_KEY }} -# + xcode12_3: + runs-on: macOS-latest + steps: + - uses: actions/checkout@v1 + - name: "Testing on Xcode 12.3" + run: test/travis_ci.sh + env: + DEVELOPER_DIR: /Applications/Xcode_12.3.app + CERTS_PASS: ${{ secrets.CERTS_PASS }} + DECORD_KEY: ${{ secrets.DECORD_KEY }} + From a94f59c5348cd2f2358b92b305828ce29693e1f4 Mon Sep 17 00:00:00 2001 From: Shin Yamamoto Date: Fri, 22 Jan 2021 00:14:53 +0900 Subject: [PATCH 2/3] Set exclude archs for simulators to arm64 --- sample/SampleApp.xcodeproj/project.pbxproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sample/SampleApp.xcodeproj/project.pbxproj b/sample/SampleApp.xcodeproj/project.pbxproj index 8e7e899..5586a49 100644 --- a/sample/SampleApp.xcodeproj/project.pbxproj +++ b/sample/SampleApp.xcodeproj/project.pbxproj @@ -327,6 +327,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = J3D7L9FHSS; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -338,6 +339,8 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; DEVELOPMENT_TEAM = J3D7L9FHSS; + EXCLUDED_ARCHS = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -496,6 +499,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = SampleFramework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -520,6 +524,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = SampleFramework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; From b67132f37ab9ec8f301d2ce1c5edd75eac7d1ac5 Mon Sep 17 00:00:00 2001 From: Shin Yamamoto Date: Fri, 22 Jan 2021 00:31:59 +0900 Subject: [PATCH 3/3] test: fix test errors --- test/build.bats | 12 ++++++------ test/package.bats | 2 +- test/resign.bats | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/build.bats b/test/build.bats index db553a1..4c9de9b 100644 --- a/test/build.bats +++ b/test/build.bats @@ -8,9 +8,9 @@ load test_helper [[ ! "${output}" =~ "\[[ \*]*\]" ]] [[ ! "${output}" =~ "Time:" ]] file ./SampleFramework.framework/SampleFramework | grep -q arm.* - file ./SampleFramework.framework/SampleFramework | grep -q x86_64 + file ./SampleFramework.framework/SampleFramework | grep -q i386 ls ./SampleFramework.framework/Modules/SampleFramework.swiftmodule | grep -q arm* - ls ./SampleFramework.framework/Modules/SampleFramework.swiftmodule | grep -q x86_64.* + ls ./SampleFramework.framework/Modules/SampleFramework.swiftmodule | grep -q i386.* } @test "relax build framework --progress" { @@ -26,9 +26,9 @@ load test_helper [[ -f ./SampleFramework.framework/SampleFramework ]] file ./SampleFramework.framework/SampleFramework | grep -q arm.* - file ./SampleFramework.framework/SampleFramework | grep -q -v x86_64 + file ./SampleFramework.framework/SampleFramework | grep -q -v i386 ls ./SampleFramework.framework/Modules/SampleFramework.swiftmodule | grep -q arm* - ls ./SampleFramework.framework/Modules/SampleFramework.swiftmodule | grep -q -v x86_64.* + ls ./SampleFramework.framework/Modules/SampleFramework.swiftmodule | grep -q -v i386.* } @test "relax build framework --framework" { @@ -43,7 +43,7 @@ load test_helper [[ -d ./Sample.framework ]] [[ -f ./Sample.framework.zip ]] file ./Sample.framework/Sample | grep -q arm.* - file ./Sample.framework/Sample | grep -q x86_64 + file ./Sample.framework/Sample | grep -q i386 } @test "relax build staticlib --framework Sample --no-simulator" { @@ -54,7 +54,7 @@ load test_helper [[ -f ./Sample.framework.zip ]] file ./Sample.framework/Sample | grep -q arm.* - file ./Sample.framework/Sample | grep -q -v x86_64 + file ./Sample.framework/Sample | grep -q -v i386 } @test "relax build: check workspace restoration" { diff --git a/test/package.bats b/test/package.bats index 02ce100..afbe554 100644 --- a/test/package.bats +++ b/test/package.bats @@ -6,7 +6,7 @@ load test_helper run relax export development run relax package development artifact assert_success - [[ -f artifact/Sample\ App.ipa ]]; \ + [[ $(find artifact -name "Sample*.ipa") ]]; \ [[ -f artifact/Sample\ App.xcarchive.zip ]] } diff --git a/test/resign.bats b/test/resign.bats index fe5daa5..1e5d284 100644 --- a/test/resign.bats +++ b/test/resign.bats @@ -17,7 +17,7 @@ load test_helper run relax resign -k relax.keychain -i "com.scenee.SampleApp" -p "Relax AdHoc" -c "iPhone Distribution: Shin Yamamoto (J3D7L9FHSS)" "$(relax show development ipa)" assert_success - run relax validate "Sample App-resigned.ipa" + run relax validate "$(find . -name "*-resigned.ipa")" assert_success }