Skip to content

Commit dfa91d8

Browse files
zsy-jasonjianliang00
authored andcommitted
[Infra] use 15.6.1 macos runners and remove bundler
1. use the 15.6.1 macos with Xcode26.3 2. Since using CocoaPods via Bundler tends to cause inconsistent issues across different environments, we will no longer use Bundler and instead rely directly on the globally installed CocoaPods.
1 parent aa68a10 commit dfa91d8

19 files changed

Lines changed: 62 additions & 222 deletions

File tree

.github/actions/clay-macos-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ runs:
1414
run: |-
1515
cd $GITHUB_WORKSPACE/lynx
1616
source tools/envsetup.sh
17-
buildtools/gn/gn gen out/Default --args='enable_clay_standalone = true disable_visibility_hidden = true use_ndk_static_cxx = false enable_linker_map = false enable_clay = true is_headless = true skia_enable_flutter_defines = true skia_use_dng_sdk = false skia_use_sfntly = false skia_enable_pdf = false skia_enable_svg = true enable_svg = true skia_enable_skottie = true skia_use_x11 = false skia_use_wuffs = true skia_use_expat = true skia_use_fontconfig = false clay_enable_skshaper = true skia_use_icu = true skia_gl_standard = "" allow_deprecated_api_calls = true stripped_symbols = true is_official_build = true is_debug = false use_clang_static_analyzer = false enable_lto = false' --export-compile-commands
17+
buildtools/gn/gn gen out/Default --args='enable_clay_standalone = true disable_visibility_hidden = true use_ndk_static_cxx = false enable_linker_map = false enable_clay = true is_headless = true skia_enable_flutter_defines = true skia_use_dng_sdk = false skia_use_sfntly = false skia_enable_pdf = false skia_enable_svg = true enable_svg = true skia_enable_skottie = true skia_use_x11 = false skia_use_wuffs = true skia_use_expat = true skia_use_fontconfig = false clay_enable_skshaper = true skia_use_icu = true skia_gl_standard = "" allow_deprecated_api_calls = true stripped_symbols = true is_official_build = true is_debug = false use_clang_static_analyzer = false enable_lto = false use_flutter_cxx = false' --export-compile-commands
1818
buildtools/ninja/ninja -C out/Default clay/example/glfw

.github/actions/ios-common-deps/action.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/actions/ios-explorer-build/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ runs:
1616
steps:
1717
- name: Install Common Dependencies
1818
uses: ./lynx/.github/actions/common-deps
19-
- name: Setup Ruby Cache
20-
uses: ./lynx/.github/actions/ios-common-deps
2119
- name: Install iOS Dependencies
2220
uses: nick-fields/retry@v2
2321
with:

.github/workflows/ci.yml

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
6868
darwin-native-unittests-check:
6969
timeout-minutes: 60
70-
runs-on: lynx-darwin-14-medium
70+
runs-on: lynx-darwin-15.6.1-medium
7171
steps:
7272
- name: Download Source
7373
uses: actions/checkout@v6
@@ -79,7 +79,7 @@ jobs:
7979
run: |
8080
set -e
8181
source tools/envsetup.sh
82-
tools/rtf/rtf native-ut run --names lynx
82+
tools/rtf/rtf native-ut run --names lynx --disable-flutter-cxx
8383
8484
linux-native-unittests-check:
8585
runs-on: lynx-ubuntu-22.04-large
@@ -123,18 +123,14 @@ jobs:
123123
124124
ios-unittests-check:
125125
timeout-minutes: 60
126-
runs-on: lynx-darwin-14-medium
126+
runs-on: lynx-darwin-15.6.1-medium
127127
steps:
128128
- name: Download Source
129129
uses: actions/checkout@v6
130130
with:
131131
path: lynx
132132
- name: Install Common Dependencies
133133
uses: ./lynx/.github/actions/common-deps
134-
- name: Setup Ruby Cache
135-
uses: ./lynx/.github/actions/ios-common-deps
136-
with:
137-
cache-backend: 'lynx-infra'
138134
- name: Install iOS Dependencies
139135
uses: nick-fields/retry@v2
140136
with:
@@ -156,9 +152,10 @@ jobs:
156152
xcodebuild -showsdks | grep -Eo -m 1 "iphonesimulator([0-9]{1,}\.)+[0-9]{1,}" > sdk.txt
157153
sdkVersion=$(awk '{ sub(/iphonesimulator/,""); print $0 }' sdk.txt)
158154
echo $sdkVersion > sdk.txt
159-
xcodebuild build-for-testing ARCHS=arm64 -workspace LynxExplorer.xcworkspace -scheme LynxExplorerTests -enableCodeCoverage YES -configuration Debug -sdk iphonesimulator$(cat sdk.txt) COMPILER_INDEX_STORE_ENABLE=NO -derivedDataPath iOSCoreBuild/DerivedData -dest"platform=iOS Simulator,OS=$(cat sdk.txt),name=iPhone 11" SYMROOT=`pwd`/Build/Products -testPlan UTTest
155+
SIMULATOR_ID=$(xcrun simctl list devices | grep -E "iPhone" | grep -v "unavailable" | head -1 | grep -Eo "[0-9A-F-]{36}")
156+
xcodebuild build-for-testing ARCHS=arm64 -workspace LynxExplorer.xcworkspace -scheme LynxExplorerTests -enableCodeCoverage YES -configuration Debug -sdk iphonesimulator$(cat sdk.txt) COMPILER_INDEX_STORE_ENABLE=NO -derivedDataPath iOSCoreBuild/DerivedData -destination "platform=iOS Simulator,id=$SIMULATOR_ID" SYMROOT=`pwd`/Build/Products -testPlan UTTest
160157
chmod u+x xctestrunner
161-
./xctestrunner --xctestrun `pwd`/Build/Products/LynxExplorerTests_UTTest_iphonesimulator$(cat sdk.txt)-arm64.xctestrun --work_dir `pwd` --output_dir `pwd`/iOSCoreBuild/DerivedData simulator_test
158+
./xctestrunner --xctestrun `pwd`/Build/Products/LynxExplorerTests_UTTest_iphonesimulator$(cat sdk.txt)-arm64.xctestrun --work_dir `pwd` --output_dir `pwd`/iOSCoreBuild/DerivedData test --id $SIMULATOR_ID --platform ios_simulator
162159
popd
163160
164161
cocoapods-lynx-library-build:
@@ -220,7 +217,7 @@ jobs:
220217
221218
tasm-darwin-build:
222219
timeout-minutes: 60
223-
runs-on: lynx-darwin-14-medium
220+
runs-on: lynx-darwin-15.6.1-medium
224221
steps:
225222
- name: Download Source
226223
uses: actions/checkout@v6
@@ -243,7 +240,7 @@ jobs:
243240
244241
tasm-wasm-build:
245242
timeout-minutes: 60
246-
runs-on: lynx-darwin-14-medium
243+
runs-on: lynx-darwin-15.6.1-medium
247244
steps:
248245
- name: Download Source
249246
uses: actions/checkout@v6
@@ -648,7 +645,7 @@ jobs:
648645

649646
ios-explorer-build:
650647
timeout-minutes: 60
651-
runs-on: lynx-darwin-14-medium
648+
runs-on: lynx-darwin-15.6.1-medium
652649
strategy:
653650
matrix:
654651
arch: [arm64, x86_64]
@@ -671,7 +668,7 @@ jobs:
671668

672669
ios-integration-test:
673670
timeout-minutes: 15
674-
runs-on: lynx-darwin-14-medium
671+
runs-on: lynx-darwin-15.6.1-medium
675672
env:
676673
LOCAL_POD_NAME: 'local_pod'
677674
POD_VERSION: '0.0.1-alpha.1'
@@ -684,14 +681,13 @@ jobs:
684681
path: lynx
685682
- name: Install Common Dependencies
686683
uses: ./lynx/.github/actions/common-deps
687-
- name: Setup Ruby Cache
688-
uses: ./lynx/.github/actions/ios-common-deps
689-
with:
690-
cache-backend: 'lynx-infra'
691684
- name: Prepare cocoapods publish source
692685
run: |-
693686
source tools/envsetup.sh
694687
export LANG=en_US.UTF-8
688+
bundle -v
689+
bundle config set path .
690+
SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk bundle install
695691
python3 tools/ios_tools/cocoapods_publish_helper.py --prepare-source --tag $POD_VERSION --version $POD_VERSION --component all
696692
- name: Publish to Local Pod Source
697693
run: |-
@@ -715,8 +711,7 @@ jobs:
715711
python3 lynx/tools/ios_tools/process_podfile.py --action insert_pod_source --podfile demo/ios/HelloLynxObjc/Podfile --pod_source "file://$GITHUB_WORKSPACE/lynx/$LOCAL_POD_NAME"
716712
cd demo/ios/HelloLynxObjc
717713
export LANG=en_US.UTF-8
718-
BUNDLE_GEMFILE=$GITHUB_WORKSPACE/lynx/Gemfile bundle --version
719-
BUNDLE_GEMFILE=$GITHUB_WORKSPACE/lynx/Gemfile bundle exec pod install
714+
pod install
720715
xcodebuild -workspace Hello-Lynx-OC.xcworkspace/ -scheme Hello-Lynx-OC CODE_SIGNING_ALLOWED=NO build
721716
722717
ios-e2e-test:
@@ -725,18 +720,14 @@ jobs:
725720
env:
726721
APPIUM_TEST_SERVER_PORT: 4723
727722
APPIUM_TEST_SERVER_HOST: 127.0.0.1
728-
runs-on: lynx-darwin-14-medium
723+
runs-on: lynx-darwin-15.6.1-medium
729724
steps:
730725
- name: Download Source
731726
uses: actions/checkout@v6
732727
with:
733728
path: lynx
734729
- name: Install Common Dependencies
735730
uses: ./lynx/.github/actions/common-deps
736-
- name: Setup Ruby Cache
737-
uses: ./lynx/.github/actions/ios-common-deps
738-
with:
739-
cache-backend: 'lynx-infra'
740731
- name: Get iOS simulator SDK version
741732
run: |
742733
xcodebuild -showsdks | grep -Eo -m 1 "iphonesimulator([0-9]{1,}\.)+[0-9]{1,}" > sdk.txt
@@ -757,16 +748,16 @@ jobs:
757748
-configuration Release \
758749
-sdk iphonesimulator${{ env.SDK_VERSION }} \
759750
-derivedDataPath ./WebDriverAgent/DerivedData \
760-
-destination "platform=iOS Simulator,OS=${{ env.SDK_VERSION }},name=iPhone 15" \
751+
-destination "platform=iOS Simulator,OS=${{ env.SDK_VERSION }},name=iPhone 17" \
761752
SYMROOT=$GITHUB_WORKSPACE/Build/Products
762753
popd
763754
- name: Start iOS Simulator
764755
run: |
765-
xcrun simctl boot "iPhone 15"
756+
xcrun simctl boot "iPhone 17"
766757
- name: Install WebDriverAgent to Simulator
767758
run: |
768759
set -e
769-
SIMULATOR_UDID=$(xcrun simctl list devices "iOS ${{ env.SDK_VERSION }}" | grep "iPhone 15 (" | grep -oE '[0-9A-F-]{36}')
760+
SIMULATOR_UDID=$(xcrun simctl list devices "iOS ${{ env.SDK_VERSION }}" | grep "iPhone 17 (" | grep -oE '[0-9A-F-]{36}')
770761
echo "SIMULATOR_UDID=$SIMULATOR_UDID" >> $GITHUB_ENV
771762
xcrun simctl install $SIMULATOR_UDID \
772763
$GITHUB_WORKSPACE/Build/Products/Release-iphonesimulator/WebDriverAgentRunner-Runner.app
@@ -896,7 +887,7 @@ jobs:
896887

897888
clay-macos-build:
898889
timeout-minutes: 60
899-
runs-on: lynx-darwin-14-medium
890+
runs-on: lynx-darwin-15.6.1-medium
900891
steps:
901892
- name: Download Source
902893
uses: actions/checkout@v6
@@ -912,7 +903,7 @@ jobs:
912903

913904
macos-explorer-build:
914905
timeout-minutes: 60
915-
runs-on: lynx-darwin-14-medium
906+
runs-on: lynx-darwin-15.6.1-medium
916907
strategy:
917908
matrix:
918909
arch: [arm64, x64]

.github/workflows/cocoapods_token_keepalive.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@ on:
66
workflow_dispatch:
77
jobs:
88
token-keepalive:
9-
runs-on: lynx-darwin-14-medium
9+
runs-on: lynx-darwin-15.6.1-medium
1010
env:
1111
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
1212
steps:
1313
- name: Download Source
1414
uses: actions/checkout@v6
1515
with:
1616
path: lynx
17-
- name: Setup Ruby Cache
18-
uses: ./lynx/.github/actions/ios-common-deps
19-
with:
20-
cache-backend: 'lynx-infra'
2117
- name: Keep CocoaPods Token alive
2218
run: |
2319
cd $GITHUB_WORKSPACE/lynx

.github/workflows/publish-release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177

178178
ios-explorer-build:
179179
timeout-minutes: 60
180-
runs-on: lynx-darwin-14-medium
180+
runs-on: lynx-darwin-15.6.1-medium
181181
needs: get-version
182182
if: ${{ !contains(needs.get-version.outputs.version, '-nightly.') }}
183183
strategy:
@@ -313,10 +313,6 @@ jobs:
313313
uses: ./lynx/.github/actions/common-deps
314314
with:
315315
cache-backend: github
316-
- name: Setup Ruby Cache
317-
uses: ./lynx/.github/actions/ios-common-deps
318-
with:
319-
cache-backend: 'github'
320316
- name: Publish iOS SDK
321317
uses: ./lynx/.github/actions/ios-sdk-publish
322318
with:
@@ -491,7 +487,7 @@ jobs:
491487
492488
macos-explorer-release:
493489
timeout-minutes: 60
494-
runs-on: lynx-darwin-14-medium
490+
runs-on: lynx-darwin-15.6.1-medium
495491
needs: get-version
496492
if: ${{ !contains(needs.get-version.outputs.version, '-nightly.') }}
497493
strategy:

.github/workflows/sdk-release-test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ jobs:
7272
uses: ./lynx/.github/actions/common-deps
7373
with:
7474
cache-backend: github
75-
- name: Setup Ruby Cache
76-
uses: ./lynx/.github/actions/ios-common-deps
77-
with:
78-
cache-backend: 'github'
7975
- name: Prepare cocoapods publish source
8076
run: |-
8177
source tools/envsetup.sh

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
source 'https://rubygems.org'
2-
gem "cocoapods", '1.11.3'
3-
gem "ffi", "1.16.3"
2+
gem "cocoapods", '1.16.2'

0 commit comments

Comments
 (0)