[Infra] use 15.6.1 macos runners and remove bundler

zsy-jason · deanjingshui · commit bc9d6ab5000a · 2026-06-18T19:18:11.000+08:00
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.
diff --git a/.github/actions/clay-macos-build/action.yml b/.github/actions/clay-macos-build/action.yml
@@ -14,5 +14,5 @@ runs:
       run: |-
         cd $GITHUB_WORKSPACE/lynx
         source tools/envsetup.sh
-        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
+        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
         buildtools/ninja/ninja -C out/Default clay/example/glfw
diff --git a/.github/actions/common-deps/action.yml b/.github/actions/common-deps/action.yml
@@ -30,6 +30,7 @@ runs:
       id: hab
       shell: bash
       run: |
+        which python3
         if [[ "${{ inputs.target }}" == "" ]]; then
           python3 lynx/tools/ci/habitat_cache_helper.py
         else
@@ -87,6 +88,7 @@ runs:
         timeout_minutes: 20
         command: |
           set -e
+          which python3
           if [ "$RUNNER_OS" == "macOS" ]; then
             python3 -m pip install -r lynx/tools/vpython_tools/requirements.txt --break-system-packages --retries 10 --timeout 60
             python3 -m pip install -r lynx/testing/integration_test/test_script/requirements.txt --break-system-packages --retries 10 --timeout 60
diff --git a/.github/actions/ios-explorer-build/action.yml b/.github/actions/ios-explorer-build/action.yml
@@ -18,6 +18,11 @@ runs:
       uses: ./lynx/.github/actions/common-deps
     - name: Setup Ruby Cache
       uses: ./lynx/.github/actions/ios-common-deps
+    - name: Setup CocoaPods
+      shell: bash
+      run: |
+        brew install cocoapods
+        pod --version
     - name: Install iOS Dependencies
       uses: nick-fields/retry@v2
       with:
@@ -29,6 +34,8 @@ runs:
           source tools/envsetup.sh
           pushd explorer/darwin/ios/lynx_explorer
           git config --global url."https://github.com/".insteadOf "git@github.com:"
+          export GEM_HOME="$RUNNER_TEMP/cocoapods/ruby/$(ruby -e 'puts RbConfig::CONFIG["ruby_version"]')"
+          export PATH="$RUNNER_TEMP/cocoapods/ruby/$(ruby -e 'puts RbConfig::CONFIG["ruby_version"]')/bin:$PATH"
           bash bundle_install.sh ${{ inputs.build-params }}
           popd
     - name: Build Explorer App
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,19 +67,43 @@ jobs:
 
   darwin-native-unittests-check:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     steps:
       - name: Download Source
         uses: actions/checkout@v6
         with:
           path: lynx
+      - name: check python version
+        run: |
+          python3 --version
+          which python3
       - name: Install Common Dependencies
         uses: ./lynx/.github/actions/common-deps
       - name: Run Unittests
         run: |
           set -e
           source tools/envsetup.sh
-          tools/rtf/rtf native-ut run --names lynx
+          tools/rtf/rtf native-ut run --names lynx --disable-flutter-cxx
+
+  darwin-native-unittests-check-old:
+    timeout-minutes: 60
+    runs-on: lynx-darwin-14-medium
+    steps:
+      - name: Download Source
+        uses: actions/checkout@v4.2.2
+        with:
+          path: lynx
+      - name: check python version
+        run: |
+          python3 --version
+          which python3
+      - name: Install Common Dependencies
+        uses: ./lynx/.github/actions/common-deps
+      - name: Run Unittests
+        run: |
+          set -e
+          source tools/envsetup.sh
+          tools/rtf/rtf native-ut run --names lynx --disable-flutter-cxx
 
   linux-native-unittests-check:
     runs-on: lynx-ubuntu-22.04-large
@@ -123,7 +147,7 @@ jobs:
 
   ios-unittests-check:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     steps:
       - name: Download Source
         uses: actions/checkout@v6
@@ -135,6 +159,10 @@ jobs:
         uses: ./lynx/.github/actions/ios-common-deps
         with:
           cache-backend: 'lynx-infra'
+      - name: Setup CocoaPods
+        shell: bash
+        run: |
+          brew install cocoapods
       - name: Install iOS Dependencies
         uses: nick-fields/retry@v2
         with:
@@ -156,9 +184,12 @@ jobs:
           xcodebuild -showsdks | grep -Eo -m 1 "iphonesimulator([0-9]{1,}\.)+[0-9]{1,}" > sdk.txt
           sdkVersion=$(awk '{ sub(/iphonesimulator/,""); print $0 }' sdk.txt)
           echo $sdkVersion > sdk.txt
-          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
+          cat sdk.txt
+          SIMULATOR_ID=$(xcrun simctl list devices | grep -E "iPhone" | grep -v "unavailable" | head -1 | grep -Eo "[0-9A-F-]{36}")
+          echo "Using simulator ID: $SIMULATOR_ID"
+          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
           chmod u+x xctestrunner
-          ./xctestrunner --xctestrun `pwd`/Build/Products/LynxExplorerTests_UTTest_iphonesimulator$(cat sdk.txt)-arm64.xctestrun --work_dir `pwd` --output_dir `pwd`/iOSCoreBuild/DerivedData simulator_test
+          ./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
           popd
 
   cocoapods-lynx-library-build:
@@ -220,7 +251,7 @@ jobs:
 
   tasm-darwin-build:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     steps:
       - name: Download Source
         uses: actions/checkout@v6
@@ -243,7 +274,7 @@ jobs:
 
   tasm-wasm-build:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     steps:
       - name: Download Source
         uses: actions/checkout@v6
@@ -648,7 +679,7 @@ jobs:
 
   ios-explorer-build:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     strategy:
       matrix:
         arch: [arm64, x86_64]
@@ -671,7 +702,7 @@ jobs:
 
   ios-integration-test:
     timeout-minutes: 15
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     env:
       LOCAL_POD_NAME: 'local_pod'
       POD_VERSION: '0.0.1-alpha.1'
@@ -715,8 +746,8 @@ jobs:
           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"
           cd demo/ios/HelloLynxObjc
           export LANG=en_US.UTF-8
-          BUNDLE_GEMFILE=$GITHUB_WORKSPACE/lynx/Gemfile bundle --version
-          BUNDLE_GEMFILE=$GITHUB_WORKSPACE/lynx/Gemfile bundle exec pod install
+          brew install cocoapods
+          pod install
           xcodebuild -workspace Hello-Lynx-OC.xcworkspace/ -scheme Hello-Lynx-OC CODE_SIGNING_ALLOWED=NO build
 
   ios-e2e-test:
@@ -725,7 +756,7 @@ jobs:
     env:
       APPIUM_TEST_SERVER_PORT: 4723
       APPIUM_TEST_SERVER_HOST: 127.0.0.1
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     steps:
       - name: Download Source
         uses: actions/checkout@v6
@@ -757,16 +788,16 @@ jobs:
               -configuration Release \
               -sdk iphonesimulator${{ env.SDK_VERSION }} \
               -derivedDataPath ./WebDriverAgent/DerivedData \
-              -destination "platform=iOS Simulator,OS=${{ env.SDK_VERSION }},name=iPhone 15" \
+              -destination "platform=iOS Simulator,OS=${{ env.SDK_VERSION }},name=iPhone 17" \
               SYMROOT=$GITHUB_WORKSPACE/Build/Products
             popd
       - name: Start iOS Simulator
         run: |
-          xcrun simctl boot "iPhone 15"
+          xcrun simctl boot "iPhone 17"
       - name: Install WebDriverAgent to Simulator
         run: |
           set -e
-          SIMULATOR_UDID=$(xcrun simctl list devices "iOS ${{ env.SDK_VERSION }}" | grep "iPhone 15 (" | grep -oE '[0-9A-F-]{36}')
+          SIMULATOR_UDID=$(xcrun simctl list devices "iOS ${{ env.SDK_VERSION }}" | grep "iPhone 17 (" | grep -oE '[0-9A-F-]{36}')
           echo "SIMULATOR_UDID=$SIMULATOR_UDID" >> $GITHUB_ENV
           xcrun simctl install $SIMULATOR_UDID \
             $GITHUB_WORKSPACE/Build/Products/Release-iphonesimulator/WebDriverAgentRunner-Runner.app
@@ -896,7 +927,7 @@ jobs:
 
   clay-macos-build:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     steps:
       - name: Download Source
         uses: actions/checkout@v6
@@ -912,7 +943,7 @@ jobs:
 
   macos-explorer-build:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     strategy:
       matrix:
         arch: [arm64, x64]
diff --git a/.github/workflows/cocoapods_token_keepalive.yml b/.github/workflows/cocoapods_token_keepalive.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 jobs:
   token-keepalive:
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     env:
       COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
     steps:
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -177,7 +177,7 @@ jobs:
 
   ios-explorer-build:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     needs: get-version
     if: ${{ !contains(needs.get-version.outputs.version, '-nightly.') }}
     strategy:
@@ -491,7 +491,7 @@ jobs:
 
   macos-explorer-release:
     timeout-minutes: 60
-    runs-on: lynx-darwin-14-medium
+    runs-on: lynx-darwin-15.6.1-medium
     needs: get-version
     if: ${{ !contains(needs.get-version.outputs.version, '-nightly.') }}
     strategy:
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/dependencies/DEPS b/dependencies/DEPS
@@ -376,7 +376,7 @@ deps = {
     "./tools_shared": {
         "type": "git",
         "url": "https://github.com/lynx-family/tools-shared.git",
-        "commit": "2d6bd311f2ad10a3e17ddde395adbc7fc1fffb59",
+        "commit": "a650d5133ce331e4303c2d01805936cf08aef05e",
         "ignore_in_git": True,
     },
     'buildtools/doxygen': {
diff --git a/dependencies/DEPS.tools_shared b/dependencies/DEPS.tools_shared
@@ -7,7 +7,7 @@ deps = {
     "./tools_shared": {
         "type": "git",
         "url": "https://github.com/lynx-family/tools-shared.git",
-        "commit": "a1f5807a5e89b52d4c015a946371bd29730a31c8",
+        "commit": "a650d5133ce331e4303c2d01805936cf08aef05e",
         "ignore_in_git": True,
     },
     'buildtools/checkstyle/checkstyle.jar':{
diff --git a/explorer/darwin/ios/README.md b/explorer/darwin/ios/README.md
@@ -12,6 +12,7 @@ This document provides instructions for building the Lynx Explorer iOS app from
 The following dependencies are needed:
 
 - Xcode(>=15.0)
+- Cocoapods(>=1.11.3)
 - Python library
 
 We recommend using [Homebrew](https://brew.sh/) to install the dependencies.
@@ -76,10 +77,3 @@ By default, the project doesn't configure the "Team" for signing. If you want to
 3. Update the "Bundle Identifier" from `com.lynx.LynxExplorer` to a unique identifier like `com.<your-name>.LynxExplorer`. This step ensures the identifier is unique and available for your use.
 4. Enable the "Automatically manage signing" option to allow Xcode to handle the app signing process automatically.
 
-### Handle Error when Installing Ruby Gems
-
-When running `./bundle_install.sh` command, if you encounter the following problems: *Bundler::GemNotFound: Your bundle is lock to xxx, but that version could not be found in any of the sources listed in Gemfile...* You can try running the following commands to fix the problem:
-```
-SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk bundle install
-./bundle_install.sh
-```
diff --git a/explorer/darwin/ios/lynx_explorer/bundle_install.sh b/explorer/darwin/ios/lynx_explorer/bundle_install.sh
