From 9fddbb25895958c3537fee563e89d8b8e9231f7d Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 10:58:18 -0700 Subject: [PATCH 01/14] ci: remove unnecessary files from the prebuilt package --- Scripts/ci/build-sim.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index de52abccf..a54b85a6d 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -14,6 +14,14 @@ xcodebuild clean build-for-testing \ pushd wda_build # to remove unnecessary space consuming files rm -rf Build/Intermediates.noindex + +# Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA +rm -rf Build/**/$SCHEME-Runner.app/Frameworks/Testing.framework + +# This library is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. +# Xcode 16 generates a 2.6 MB file size. Xcode 15 was a 1 MB file size. +rm -rf Build/**/$SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib + zip -r $ZIP_PKG_NAME Build popd mv wda_build/$ZIP_PKG_NAME ./ From c4a4f985716b43c93b7c4b71e545196d653ea695 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 11:08:42 -0700 Subject: [PATCH 02/14] adjust the path --- Scripts/ci/build-sim.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index a54b85a6d..6f45ff5bf 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -16,11 +16,11 @@ pushd wda_build rm -rf Build/Intermediates.noindex # Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA -rm -rf Build/**/$SCHEME-Runner.app/Frameworks/Testing.framework +rm -rf Build/**/Frameworks/Testing.framework # This library is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. # Xcode 16 generates a 2.6 MB file size. Xcode 15 was a 1 MB file size. -rm -rf Build/**/$SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib +rm -rf Build/**/Frameworks/libXCTestSwiftSupport.dylib zip -r $ZIP_PKG_NAME Build popd From 8a826e546fd0de9e9c2b05aa1cd428e3c23b40e8 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 22:36:59 -0700 Subject: [PATCH 03/14] debug --- Scripts/ci/build-sim.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 6f45ff5bf..210635ddf 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -x + # To run build script for CI xcodebuild clean build-for-testing \ From 699f12683b70b5391904dfc2dc9a364f9ca95d90 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 22:54:26 -0700 Subject: [PATCH 04/14] debug --- Scripts/ci/build-sim.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 210635ddf..a84d86de3 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -9,7 +9,11 @@ xcodebuild clean build-for-testing \ -derivedDataPath wda_build \ -scheme $SCHEME \ -destination "$DESTINATION" \ - CODE_SIGNING_ALLOWED=NO ARCHS=$ARCHS + CODE_SIGNING_ALLOWED=NO ARCHS=$ARCHS & + +# CI started starting the next `rm` etc BEFORE ending this xcodebuild, which is weird, +# but to make sure the behavior on ci. +wait # simulator needs to build entire build files From e6997bc33d937398e98c488c1855d846919022d5 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 23:23:23 -0700 Subject: [PATCH 05/14] use cd instead --- Scripts/ci/build-sim.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index a84d86de3..e86c90cb8 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -9,15 +9,11 @@ xcodebuild clean build-for-testing \ -derivedDataPath wda_build \ -scheme $SCHEME \ -destination "$DESTINATION" \ - CODE_SIGNING_ALLOWED=NO ARCHS=$ARCHS & - -# CI started starting the next `rm` etc BEFORE ending this xcodebuild, which is weird, -# but to make sure the behavior on ci. -wait + CODE_SIGNING_ALLOWED=NO ARCHS=$ARCHS # simulator needs to build entire build files -pushd wda_build +cd wda_build # to remove unnecessary space consuming files rm -rf Build/Intermediates.noindex @@ -29,5 +25,5 @@ rm -rf Build/**/Frameworks/Testing.framework rm -rf Build/**/Frameworks/libXCTestSwiftSupport.dylib zip -r $ZIP_PKG_NAME Build -popd +cd .. mv wda_build/$ZIP_PKG_NAME ./ From 7c02629b39003a22efc183f57ac03be133de96df Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 23:38:34 -0700 Subject: [PATCH 06/14] modify --- .github/workflows/wda-package.yml | 19 +++++++++++++++---- Scripts/ci/build-sim.sh | 21 ++++++--------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/wda-package.yml b/.github/workflows/wda-package.yml index 93ad63f91..37794e763 100644 --- a/.github/workflows/wda-package.yml +++ b/.github/workflows/wda-package.yml @@ -76,9 +76,19 @@ jobs: strategy: matrix: - # '' is for iOS - target: ['', '_tvOS'] - arch: [x86_64, arm64] + include: + - target: '' + arch: x86_64 + simulator_name: Debug-iphonesimulator + - target: '' + arch: arm64 + simulator_name: Debug-iphonesimulator + - target: '_tvOS' + arch: x86_64 + simulator_name: Debug-appletvsimulator + - target: '_tvOS' + arch: arm64 + simulator_name: Debug-appletvsimulator steps: - name: Checkout uses: actions/checkout@v3 @@ -89,10 +99,11 @@ jobs: run: | DESTINATION=$DESTINATION_SIM${{ matrix.target }} sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh env: - TARGET: ${{ matrix.target }} SCHEME: WebDriverAgentRunner${{ matrix.target }} ARCHS: ${{ matrix.arch }} ZIP_PKG_NAME: "WebDriverAgentRunner${{ matrix.target }}-Build-Sim-${{ matrix.arch }}.zip" + DERIVED_DATA_PATH: wda_build + WD: wda_build/Build/Products/${{ matrix.simulator_name }} - name: Upload the built generic app package for WebDriverAgentRunner${{ matrix.target }} with ${{ matrix.arch }} uses: actions/upload-artifact@master with: diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index e86c90cb8..4fbb27af6 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -6,24 +6,15 @@ set -x xcodebuild clean build-for-testing \ -project WebDriverAgent.xcodeproj \ - -derivedDataPath wda_build \ + -derivedDataPath $DERIVED_DATA_PATH \ -scheme $SCHEME \ -destination "$DESTINATION" \ CODE_SIGNING_ALLOWED=NO ARCHS=$ARCHS -# simulator needs to build entire build files +pushd WD -cd wda_build -# to remove unnecessary space consuming files -rm -rf Build/Intermediates.noindex +rm -rf $SCHEME-Runner.app/Frameworks/Testing.framework $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib -# Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA -rm -rf Build/**/Frameworks/Testing.framework - -# This library is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. -# Xcode 16 generates a 2.6 MB file size. Xcode 15 was a 1 MB file size. -rm -rf Build/**/Frameworks/libXCTestSwiftSupport.dylib - -zip -r $ZIP_PKG_NAME Build -cd .. -mv wda_build/$ZIP_PKG_NAME ./ +zip -r $ZIP_PKG_NAME $SCHEME-Runner.app +popd +mv $WD/$ZIP_PKG_NAME ./ From ebc565565f201c69fddaa110f3bcfb01b716f816 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 23:42:52 -0700 Subject: [PATCH 07/14] fix $WD --- Scripts/ci/build-sim.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 4fbb27af6..85a056557 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -11,9 +11,12 @@ xcodebuild clean build-for-testing \ -destination "$DESTINATION" \ CODE_SIGNING_ALLOWED=NO ARCHS=$ARCHS -pushd WD +pushd $WD -rm -rf $SCHEME-Runner.app/Frameworks/Testing.framework $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib + # WDA doesn't use Xcode's testing feature support. +rm -rf $SCHEME-Runner.app/Frameworks/Testing.framework \ + # WDA dpesn't use Swift code. + $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib zip -r $ZIP_PKG_NAME $SCHEME-Runner.app popd From 28af9043bb607ebffaca3b1ced42fea2d8d5ece1 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Sun, 22 Jun 2025 23:55:26 -0700 Subject: [PATCH 08/14] use exclude instead --- Scripts/ci/build-real.sh | 29 ++++++++++++++--------------- Scripts/ci/build-sim.sh | 9 +++------ 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 33de1cc53..40cc33f2c 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -13,20 +13,19 @@ xcodebuild clean build-for-testing \ pushd $WD -# to remove test packages to refer to the device local instead of embedded ones -# XCTAutomationSupport.framework, XCTest.framewor, XCTestCore.framework, -# XCUIAutomation.framework, XCUnit.framework -rm -rf $SCHEME-Runner.app/Frameworks/XC*.framework - -# Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA -rm -rf $SCHEME-Runner.app/Frameworks/Testing.framework - -# This library is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. -# Xcode 16 generates a 2.6 MB file size. Xcode 15 was a 1 MB file size. -rm -rf $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib - - - -zip -r $ZIP_PKG_NAME $SCHEME-Runner.app +# # to remove test packages to refer to the device local instead of embedded ones +# # XCTAutomationSupport.framework, XCTest.framewor, XCTestCore.framework, +# # XCUIAutomation.framework, XCUnit.framework +# rm -rf $SCHEME-Runner.app/Frameworks/XC*.framework \ +# # Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA +# $SCHEME-Runner.app/Frameworks/Testing.framework \ +# # This library is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. +# # Xcode 16 generates a 2.6 MB file size. Xcode 15 was a 1 MB file size. +# $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib + +zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ + -x $SCHEME-Runner.app/Frameworks/XC*.framework \ + $SCHEME-Runner.app/Frameworks/Testing.framework \ + $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 85a056557..cf01a6804 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -13,11 +13,8 @@ xcodebuild clean build-for-testing \ pushd $WD - # WDA doesn't use Xcode's testing feature support. -rm -rf $SCHEME-Runner.app/Frameworks/Testing.framework \ - # WDA dpesn't use Swift code. - $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib - -zip -r $ZIP_PKG_NAME $SCHEME-Runner.app +zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ + -x "$SCHEME-Runner.app/Frameworks/Testing.framework" \ + "$SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib" popd mv $WD/$ZIP_PKG_NAME ./ From b648635c244da701eec15d6dec9a24592372ce2d Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 23 Jun 2025 00:19:05 -0700 Subject: [PATCH 09/14] tweakd --- Scripts/ci/build-real.sh | 4 ++-- Scripts/ci/build-sim.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 40cc33f2c..96f76e0c6 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -24,8 +24,8 @@ pushd $WD # $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/XC*.framework \ - $SCHEME-Runner.app/Frameworks/Testing.framework \ + -x $SCHEME-Runner.app/Frameworks/XC*.framework/* \ + $SCHEME-Runner.app/Frameworks/Testing.framework/* \ $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index cf01a6804..6dea2cf76 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -14,7 +14,7 @@ xcodebuild clean build-for-testing \ pushd $WD zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x "$SCHEME-Runner.app/Frameworks/Testing.framework" \ - "$SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib" + -x $SCHEME-Runner.app/Frameworks/Testing.framework/* \ + $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ From 7a8b389835b9826bf5dc0b8bf261caa8724b0ea7 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 23 Jun 2025 00:30:04 -0700 Subject: [PATCH 10/14] modify --- Scripts/ci/build-real.sh | 6 +++--- Scripts/ci/build-sim.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 96f76e0c6..10d7930da 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -24,8 +24,8 @@ pushd $WD # $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/XC*.framework/* \ - $SCHEME-Runner.app/Frameworks/Testing.framework/* \ - $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib + -x $SCHEME-Runner.app/Frameworks/XC*.framework* \ + $SCHEME-Runner.app/Frameworks/Testing.framework* \ + $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 6dea2cf76..12ff0d4df 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -14,7 +14,7 @@ xcodebuild clean build-for-testing \ pushd $WD zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/Testing.framework/* \ + -x $SCHEME-Runner.app/Frameworks/Testing.framework* \ $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ From aed4d4301023808c973f7fc2bc80ff170179e91d Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 23 Jun 2025 00:35:50 -0700 Subject: [PATCH 11/14] modify more --- Scripts/ci/build-real.sh | 6 ++++-- Scripts/ci/build-sim.sh | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 10d7930da..9f3396437 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -24,8 +24,10 @@ pushd $WD # $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/XC*.framework* \ - $SCHEME-Runner.app/Frameworks/Testing.framework* \ + -x $SCHEME-Runner.app/Frameworks/XC*.framework \ + $SCHEME-Runner.app/Frameworks/XC*.framework/* \ + $SCHEME-Runner.app/Frameworks/Testing.framework \ + $SCHEME-Runner.app/Frameworks/Testing.framework/* \ $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 12ff0d4df..027f3bc86 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -14,7 +14,8 @@ xcodebuild clean build-for-testing \ pushd $WD zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/Testing.framework* \ + -x $SCHEME-Runner.app/Frameworks/Testing.framework \ + $SCHEME-Runner.app/Frameworks/Testing.framework/* \ $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib popd mv $WD/$ZIP_PKG_NAME ./ From eb922927cf10b52c667364bd7da3fee9afe3db75 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 23 Jun 2025 00:43:23 -0700 Subject: [PATCH 12/14] modify more --- Scripts/ci/build-real.sh | 29 ++++++++++------------------- Scripts/ci/build-sim.sh | 12 +++++------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/Scripts/ci/build-real.sh b/Scripts/ci/build-real.sh index 9f3396437..bb41b0b6f 100755 --- a/Scripts/ci/build-real.sh +++ b/Scripts/ci/build-real.sh @@ -1,7 +1,5 @@ #!/bin/bash -# To run build script for CI - xcodebuild clean build-for-testing \ -project WebDriverAgent.xcodeproj \ -derivedDataPath $DERIVED_DATA_PATH \ @@ -9,25 +7,18 @@ xcodebuild clean build-for-testing \ -destination "$DESTINATION" \ CODE_SIGNING_ALLOWED=NO ARCHS=arm64 -# Only .app is needed. - pushd $WD -# # to remove test packages to refer to the device local instead of embedded ones -# # XCTAutomationSupport.framework, XCTest.framewor, XCTestCore.framework, -# # XCUIAutomation.framework, XCUnit.framework -# rm -rf $SCHEME-Runner.app/Frameworks/XC*.framework \ -# # Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA -# $SCHEME-Runner.app/Frameworks/Testing.framework \ -# # This library is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. -# # Xcode 16 generates a 2.6 MB file size. Xcode 15 was a 1 MB file size. -# $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib - +# The reason why here excludes several frameworks are: +# - to remove test packages to refer to the device local instead of embedded ones +# XCTAutomationSupport.framework, XCTest.framewor, XCTestCore.framework, +# XCUIAutomation.framework, XCUnit.framework. +# This can be excluded only for real devices. +# - Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA. +# - libXCTestSwiftSupport is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/XC*.framework \ - $SCHEME-Runner.app/Frameworks/XC*.framework/* \ - $SCHEME-Runner.app/Frameworks/Testing.framework \ - $SCHEME-Runner.app/Frameworks/Testing.framework/* \ - $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib + -x "$SCHEME-Runner.app/Frameworks/XC*.framework*" \ + "$SCHEME-Runner.app/Frameworks/Testing.framework*" \ + "$SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib" popd mv $WD/$ZIP_PKG_NAME ./ diff --git a/Scripts/ci/build-sim.sh b/Scripts/ci/build-sim.sh index 027f3bc86..c8917d277 100755 --- a/Scripts/ci/build-sim.sh +++ b/Scripts/ci/build-sim.sh @@ -1,9 +1,5 @@ #!/bin/bash -set -x - -# To run build script for CI - xcodebuild clean build-for-testing \ -project WebDriverAgent.xcodeproj \ -derivedDataPath $DERIVED_DATA_PATH \ @@ -13,9 +9,11 @@ xcodebuild clean build-for-testing \ pushd $WD +# The reason why here excludes several frameworks are: +# - Xcode 16 started generating 5.9MB of 'Testing.framework', but it might not be necessary for WDA. +# - libXCTestSwiftSupport is used for Swift testing. WDA doesn't include Swift stuff, thus this is not needed. zip -r $ZIP_PKG_NAME $SCHEME-Runner.app \ - -x $SCHEME-Runner.app/Frameworks/Testing.framework \ - $SCHEME-Runner.app/Frameworks/Testing.framework/* \ - $SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib + -x "$SCHEME-Runner.app/Frameworks/Testing.framework*" \ + "$SCHEME-Runner.app/Frameworks/libXCTestSwiftSupport.dylib" popd mv $WD/$ZIP_PKG_NAME ./ From 13610ed39c2b1e3fa755f182c4472affb523c5e1 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 23 Jun 2025 01:19:21 -0700 Subject: [PATCH 13/14] chore: include wda sim prebuilt for gh release --- .github/workflows/publish.js.yml | 35 ++++++++++++++++++++++++++++++++ .releaserc | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index f4a051efe..5c92466a0 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -14,6 +14,9 @@ jobs: env: XCODE_VERSION: 16.3 + # Available destination for simulators depend on Xcode version. + DESTINATION_SIM: platform=iOS Simulator,name=iPhone 16 Plus + DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation) steps: - uses: actions/checkout@v2 @@ -48,6 +51,38 @@ jobs: DESTINATION: generic/platform=tvOS WD: appium_wda_tvos/Build/Products/Debug-appletvos ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Runner.zip + - name: Building iOS sim arm64 + run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh + env: + DERIVED_DATA_PATH: appium_wda_ios_sim_arm64 + SCHEME: WebDriverAgentRunner + DESTINATION: ${{ env.DESTINATION_SIM }} + WD: appium_wda_ios_sim_arm64/Build/Products/Debug-iphonesimulator + ZIP_PKG_NAME: WebDriverAgentRunner-Build-Sim-arm64.zip + - name: Building iOS sim x86_64 + run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh + env: + DERIVED_DATA_PATH: appium_wda_ios_sim_x86_64 + SCHEME: WebDriverAgentRunner + DESTINATION: ${{ env.DESTINATION_SIM }} + WD: appium_wda_ios_sim_x86_64/Build/Products/Debug-iphonesimulator + ZIP_PKG_NAME: WebDriverAgentRunner-Build-Sim-x86_64.zip + - name: Building tvOS sim arm64 + run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh + env: + DERIVED_DATA_PATH: appium_wda_tvos_sim_arm64 + SCHEME: WebDriverAgentRunner_tvOS + DESTINATION: ${{ env.DESTINATION_SIM }} + WD: appium_wda_tvos_sim_arm64/Build/Products/Debug-appletvsimulator + ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Build-Sim-arm64.zip + - name: Building tvOS sim x86_64 + run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh + env: + DERIVED_DATA_PATH: appium_wda_tvos_sim_x86_64 + SCHEME: WebDriverAgentRunner_tvOS + DESTINATION: ${{ env.DESTINATION_SIM }} + WD: appium_wda_tvos_sim_x86_64/Build/Products/Debug-appletvsimulator + ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Build-Sim-x86_64.zip # release tasks - run: npx semantic-release diff --git a/.releaserc b/.releaserc index 0cb17f220..3987c1e97 100644 --- a/.releaserc +++ b/.releaserc @@ -35,7 +35,11 @@ ["@semantic-release/github", { "assets": [ "WebDriverAgentRunner-Runner.zip", - "WebDriverAgentRunner_tvOS-Runner.zip" + "WebDriverAgentRunner_tvOS-Runner.zip", + "WebDriverAgentRunner-Build-Sim-arm64.zip", + "WebDriverAgentRunner-Build-Sim-x86_64.zip", + "WebDriverAgentRunner_tvOS-Build-Sim-arm64.zip", + "WebDriverAgentRunner_tvOS-Build-Sim-x86_64.zip" ]}] ] } From daeed5e0b80384c5afbdc7635362148e098d7a68 Mon Sep 17 00:00:00 2001 From: Kazuaki Matsuo Date: Mon, 23 Jun 2025 01:21:12 -0700 Subject: [PATCH 14/14] tweak env var name --- .github/workflows/publish.js.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml index 5c92466a0..c2d918c84 100644 --- a/.github/workflows/publish.js.yml +++ b/.github/workflows/publish.js.yml @@ -16,7 +16,7 @@ jobs: XCODE_VERSION: 16.3 # Available destination for simulators depend on Xcode version. DESTINATION_SIM: platform=iOS Simulator,name=iPhone 16 Plus - DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation) + DESTINATION_SIM_TVOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation) steps: - uses: actions/checkout@v2 @@ -72,7 +72,7 @@ jobs: env: DERIVED_DATA_PATH: appium_wda_tvos_sim_arm64 SCHEME: WebDriverAgentRunner_tvOS - DESTINATION: ${{ env.DESTINATION_SIM }} + DESTINATION: ${{ env.DESTINATION_SIM_TVOS }} WD: appium_wda_tvos_sim_arm64/Build/Products/Debug-appletvsimulator ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Build-Sim-arm64.zip - name: Building tvOS sim x86_64 @@ -80,7 +80,7 @@ jobs: env: DERIVED_DATA_PATH: appium_wda_tvos_sim_x86_64 SCHEME: WebDriverAgentRunner_tvOS - DESTINATION: ${{ env.DESTINATION_SIM }} + DESTINATION: ${{ env.DESTINATION_SIM_TVOS }} WD: appium_wda_tvos_sim_x86_64/Build/Products/Debug-appletvsimulator ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Build-Sim-x86_64.zip