From a67aad0f50c34fe9a55a9dd3fb4ab1dcbc7c6835 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Fri, 22 Aug 2025 11:17:02 -0700 Subject: [PATCH] build: use siso instead of reclient (#47534) --- .github/actions/build-electron/action.yml | 46 ++++++-- .github/actions/cipd-install/action.yml | 17 ++- .github/actions/fix-sync/action.yml | 16 +++ .../actions/install-build-tools/action.yml | 3 +- .../pipeline-segment-electron-build.yml | 5 +- .../pipeline-segment-electron-test.yml | 1 + build/siso/backend.star | 2 +- build/siso/main.star | 66 +++++++++++ patches/chromium/.patches | 1 - .../revert_update_siso-chromium_image.patch | 103 ------------------ script/actions/move-artifacts.sh | 3 + script/node/generate_original_fs.py | 4 - 12 files changed, 139 insertions(+), 128 deletions(-) create mode 100644 build/siso/main.star delete mode 100644 patches/chromium/revert_update_siso-chromium_image.patch diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 42eb751283f1..5656aff2cbd3 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -63,7 +63,7 @@ runs: sudo launchctl limit maxfiles 65536 200000 fi - NINJA_SUMMARIZE_BUILD=1 e build -j $NUMBER_OF_NINJA_PROCESSES + NINJA_SUMMARIZE_BUILD=1 e build cp out/Default/.ninja_log out/electron_ninja_log node electron/script/check-symlinks.js - name: Strip Electron Binaries ${{ inputs.step-suffix }} @@ -78,7 +78,7 @@ runs: shell: bash run: | cd src - e build --target electron:electron_dist_zip -j $NUMBER_OF_NINJA_PROCESSES -d explain + e build --target electron:electron_dist_zip if [ "${{ inputs.is-asan }}" != "true" ]; then target_os=${{ inputs.target-platform == 'macos' && 'mac' || inputs.target-platform }} if [ "${{ inputs.artifact-platform }}" = "mas" ]; then @@ -90,7 +90,7 @@ runs: shell: bash run: | cd src - e build --target electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES + e build --target electron:electron_mksnapshot ELECTRON_DEPOT_TOOLS_DISABLE_LOG=1 e d gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args # Remove unused args from mksnapshot_args SEDOPTION="-i" @@ -113,7 +113,7 @@ runs: fi fi - e build --target electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES + e build --target electron:electron_mksnapshot_zip if [ "${{ inputs.target-platform }}" = "win" ]; then cd out/Default powershell Compress-Archive -update mksnapshot_args mksnapshot.zip @@ -147,7 +147,7 @@ runs: shell: bash run: | cd src - e build --target electron:electron_chromedriver -j $NUMBER_OF_NINJA_PROCESSES + e build --target electron:electron_chromedriver e build --target electron:electron_chromedriver_zip if [ "${{ inputs.is-asan }}" != "true" ]; then @@ -198,24 +198,24 @@ runs: electron/script/zip-symbols.py -b $BUILD_PATH fi - name: Generate FFMpeg ${{ inputs.step-suffix }} - if: ${{ inputs.is-release == 'true' }} shell: bash + if: ${{ inputs.is-release == 'true' }} run: | cd src gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS" - e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg -j $NUMBER_OF_NINJA_PROCESSES + e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg - name: Generate Hunspell Dictionaries ${{ inputs.step-suffix }} shell: bash if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }} run: | - e build --target electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES + e build --target electron:hunspell_dictionaries_zip - name: Generate Libcxx ${{ inputs.step-suffix }} shell: bash if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }} run: | - e build --target electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES - e build --target electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES - e build --target electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES + e build --target electron:libcxx_headers_zip + e build --target electron:libcxxabi_headers_zip + e build --target electron:libcxx_objects_zip - name: Remove Clang problem matcher shell: bash run: echo "::remove-matcher owner=clang::" @@ -238,7 +238,29 @@ runs: echo 'Uploading Electron release distribution to GitHub releases' script/release/uploaders/upload.py --verbose fi + - name: Generate siso report + if: ${{ inputs.target-platform != 'win' && !cancelled() }} + shell: bash + run: | + cd src + e d siso report -C out/Default > siso_report.txt + SISO_REPORT_PATH=$(grep -o '/.*siso-report-[^ ]*' siso_report.txt) + echo "SISO_REPORT_PATH=$SISO_REPORT_PATH" >> $GITHUB_ENV + cat siso_report.txt + echo "SISO REPORT AT $SISO_REPORT_PATH" + - name: Generate siso report (Windows) + if: ${{ inputs.target-platform == 'win' && !cancelled() }} + shell: powershell + run: | + cd src + e d siso report -C out\Default > siso_report.txt + $SISO_REPORT_PATH = Get-Content "siso_report.txt" | Select-String "report file:\s*(.+)" | ForEach-Object { + $_.Matches.Groups[1].Value.Trim() + } + echo "SISO_REPORT_PATH=$SISO_REPORT_PATH" + echo "SISO_REPORT_PATH=$SISO_REPORT_PATH" >> $env:GITHUB_ENV - name: Generate Artifact Key + if: always() && !cancelled() shell: bash run: | if [ "${{ inputs.is-asan }}" = "true" ]; then @@ -250,9 +272,11 @@ runs: # The current generated_artifacts_<< artifact.key >> name was taken from CircleCI # to ensure we don't break anything, but we may be able to improve that. - name: Move all Generated Artifacts to Upload Folder ${{ inputs.step-suffix }} + if: always() && !cancelled() shell: bash run: ./src/electron/script/actions/move-artifacts.sh - name: Upload Generated Artifacts ${{ inputs.step-suffix }} + if: always() && !cancelled() uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 with: name: generated_artifacts_${{ env.ARTIFACT_KEY }} diff --git a/.github/actions/cipd-install/action.yml b/.github/actions/cipd-install/action.yml index 327e904be473..fe3cf12cb885 100644 --- a/.github/actions/cipd-install/action.yml +++ b/.github/actions/cipd-install/action.yml @@ -14,6 +14,9 @@ inputs: description: 'Target platform, should be linux, win, macos' package: description: 'Package to install' + dependency-version: + description: 'Version of the dependency to install' + default: '' runs: using: "composite" steps: @@ -22,15 +25,23 @@ runs: run : | rm -rf ${{ inputs.cipd-root-prefix-path }}${{ inputs.installation-dir }} - name: Create ensure file for ${{ inputs.dependency }} + if: ${{ inputs.dependency-version == '' }} shell: bash run: | echo '${{ inputs.package }}' `e d gclient getdep --deps-file=${{ inputs.deps-file }} -r '${{ inputs.installation-dir }}:${{ inputs.package }}'` > ${{ inputs.dependency }}_ensure_file cat ${{ inputs.dependency }}_ensure_file - - name: CIPD installation of ${{ inputs.dependency }} (macOS) - if: ${{ inputs.target-platform == 'macos' }} + + - name: Create ensure file for ${{ inputs.dependency }} from dependency-version + if: ${{ inputs.dependency-version != '' }} shell: bash run: | - echo "ensuring ${{ inputs.dependency }} on macOS" + echo '${{ inputs.package }} ${{ inputs.dependency-version }}' > ${{ inputs.dependency }}_ensure_file + cat ${{ inputs.dependency }}_ensure_file + - name: CIPD installation of ${{ inputs.dependency }} (macOS) + if: ${{ inputs.target-platform != 'win' }} + shell: bash + run: | + echo "ensuring ${{ inputs.dependency }}" e d cipd ensure --root ${{ inputs.cipd-root-prefix-path }}${{ inputs.installation-dir }} -ensure-file ${{ inputs.dependency }}_ensure_file - name: CIPD installation of ${{ inputs.dependency }} (Windows) if: ${{ inputs.target-platform == 'win' }} diff --git a/.github/actions/fix-sync/action.yml b/.github/actions/fix-sync/action.yml index 3f49179d1819..b72d0ab18b9d 100644 --- a/.github/actions/fix-sync/action.yml +++ b/.github/actions/fix-sync/action.yml @@ -20,6 +20,7 @@ runs: using: "composite" steps: - name: Fix llvm toolchain + if: ${{ inputs.target-platform != 'linux' }} shell: bash run : | rm -rf src/third_party/llvm-build @@ -27,6 +28,7 @@ runs: # Refs https://chromium-review.googlesource.com/c/chromium/src/+/6667681 python3 src/tools/clang/scripts/update.py --package objdump - name: Fix esbuild + if: ${{ inputs.target-platform != 'linux' }} uses: ./src/electron/.github/actions/cipd-install with: cipd-root-prefix-path: src/third_party/devtools-frontend/src/ @@ -36,6 +38,7 @@ runs: target-platform: ${{ inputs.target-platform }} package: infra/3pp/tools/esbuild/${platform} - name: Fix rustc + if: ${{ inputs.target-platform != 'linux' }} shell: bash run : | rm -rf src/third_party/rust-toolchain @@ -59,6 +62,7 @@ runs: target-platform: ${{ inputs.target-platform }} package: gn/gn/windows-amd64 - name: Fix reclient + if: ${{ inputs.target-platform != 'linux' }} uses: ./src/electron/.github/actions/cipd-install with: dependency: reclient @@ -67,6 +71,7 @@ runs: target-platform: ${{ inputs.target-platform }} package: infra/rbe/client/${platform} - name: Configure reclient configs + if: ${{ inputs.target-platform != 'linux' }} shell: bash run : | python3 src/buildtools/reclient_cfgs/configure_reclient_cfgs.py --rbe_instance "projects/rbe-chrome-untrusted/instances/default_instance" --reproxy_cfg_template reproxy.cfg.template --rewrapper_cfg_project "" --skip_remoteexec_cfg_fetch @@ -84,6 +89,7 @@ runs: python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil fi - name: Fix ninja + if: ${{ inputs.target-platform != 'linux' }} uses: ./src/electron/.github/actions/cipd-install with: dependency: ninja @@ -92,10 +98,20 @@ runs: target-platform: ${{ inputs.target-platform }} package: infra/3pp/tools/ninja/${platform} - name: Set ninja in path + if: ${{ inputs.target-platform != 'linux' }} shell: bash run : | echo "$(pwd)/src/third_party/ninja" >> $GITHUB_PATH + - name: Fix siso + uses: ./src/electron/.github/actions/cipd-install + with: + dependency: siso + deps-file: src/DEPS + installation-dir: src/third_party/siso/cipd + target-platform: ${{ inputs.target-platform }} + package: infra/build/siso/${platform} - name: Fixup angle git + if: ${{ inputs.target-platform != 'linux' }} shell: bash run : | cd src/third_party/angle diff --git a/.github/actions/install-build-tools/action.yml b/.github/actions/install-build-tools/action.yml index 5b35f9ce0958..16455c17c4e0 100644 --- a/.github/actions/install-build-tools/action.yml +++ b/.github/actions/install-build-tools/action.yml @@ -13,8 +13,9 @@ runs: git config --global core.fscache true git config --global core.longpaths true git config --global core.preloadindex true + git config --global core.longpaths true fi - export BUILD_TOOLS_SHA=274cba0474f0d1e4e6adbb66c1da48556cb0add5 + export BUILD_TOOLS_SHA=8559e5d325d61f195a255f41077ffc9e5b70b0e5 npm i -g @electron/build-tools # Update depot_tools to ensure python e d update_depot_tools diff --git a/.github/workflows/pipeline-segment-electron-build.yml b/.github/workflows/pipeline-segment-electron-build.yml index 87430aed14e5..a6708c6065f6 100644 --- a/.github/workflows/pipeline-segment-electron-build.yml +++ b/.github/workflows/pipeline-segment-electron-build.yml @@ -176,7 +176,7 @@ jobs: ELECTRON_DEPOT_TOOLS_DISABLE_LOG: true - name: Init Build Tools run: | - e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} + e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --remote-build siso - name: Run Electron Only Hooks run: | e d gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]" @@ -186,9 +186,6 @@ jobs: echo "DEPSHASH=$(cat src/electron/.depshash)" >> $GITHUB_ENV - name: Add CHROMIUM_BUILDTOOLS_PATH to env run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV - - name: Setup Number of Ninja Processes - run: | - echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform != 'macos' && '300' || '200' }}" >> $GITHUB_ENV - name: Free up space (macOS) if: ${{ inputs.target-platform == 'macos' }} uses: ./src/electron/.github/actions/free-space-macos diff --git a/.github/workflows/pipeline-segment-electron-test.yml b/.github/workflows/pipeline-segment-electron-test.yml index 43ba6a85fba6..9fce07d9ef7f 100644 --- a/.github/workflows/pipeline-segment-electron-test.yml +++ b/.github/workflows/pipeline-segment-electron-test.yml @@ -156,6 +156,7 @@ jobs: git config --global core.fscache true git config --global core.longpaths true git config --global core.preloadindex true + git config --global core.longpaths true git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git # Ensure depot_tools does not update. test -d depot_tools && cd depot_tools diff --git a/build/siso/backend.star b/build/siso/backend.star index 72eb0555d38a..b729ccb68905 100644 --- a/build/siso/backend.star +++ b/build/siso/backend.star @@ -3,7 +3,7 @@ load("@builtin//struct.star", "module") def __platform_properties(ctx): - container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b" + container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a" return { "default": { "OSFamily": "Linux", diff --git a/build/siso/main.star b/build/siso/main.star new file mode 100644 index 000000000000..dab7e118a177 --- /dev/null +++ b/build/siso/main.star @@ -0,0 +1,66 @@ +load("@builtin//encoding.star", "json") +load("@builtin//path.star", "path") +load("@builtin//runtime.star", "runtime") +load("@builtin//struct.star", "module") +load("@config//main.star", upstream_init = "init") +load("@config//win_sdk.star", "win_sdk") +load("@config//gn_logs.star", "gn_logs") + +def init(ctx): + mod = upstream_init(ctx) + step_config = json.decode(mod.step_config) + + # Buildbarn doesn't support input_root_absolute_path so disable that + for rule in step_config["rules"]: + input_root_absolute_path = rule.get("input_root_absolute_path", False) + if input_root_absolute_path: + rule.pop("input_root_absolute_path", None) + + # Only wrap clang rules with a remote wrapper if not on Linux. These are currently only + # needed for X-Compile builds, which run on Windows and Mac. + if runtime.os != "linux": + for rule in step_config["rules"]: + if rule["name"].startswith("clang/") or rule["name"].startswith("clang-cl/"): + rule["remote_wrapper"] = "../../buildtools/reclient_cfgs/chromium-browser-clang/clang_remote_wrapper" + if "inputs" not in rule: + rule["inputs"] = [] + rule["inputs"].append("buildtools/reclient_cfgs/chromium-browser-clang/clang_remote_wrapper") + rule["inputs"].append("third_party/llvm-build/Release+Asserts_linux/bin/clang") + + if "executables" not in step_config: + step_config["executables"] = [] + step_config["executables"].append("buildtools/reclient_cfgs/chromium-browser-clang/clang_remote_wrapper") + step_config["executables"].append("third_party/llvm-build/Release+Asserts_linux/bin/clang") + + if runtime.os == "darwin": + # Update platforms to match our default siso config instead of reclient configs. + step_config["platforms"].update({ + "clang": step_config["platforms"]["default"], + "clang_large": step_config["platforms"]["default"], + }) + + if runtime.os == "windows": + # Add additional Windows SDK headers needed by Electron + win_toolchain_dir = win_sdk.toolchain_dir(ctx) + if win_toolchain_dir: + sdk_version = gn_logs.read(ctx).get("windows_sdk_version") + step_config["input_deps"][win_toolchain_dir + ":headers"].extend([ + # third_party/electron_node/deps/uv/include/uv/win.h includes mswsock.h + path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/mswsock.h"), + # third_party/electron_node/src/debug_utils.cc includes lm.h + path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/Lm.h"), + ]) + + # Update platforms to match our default siso config instead of reclient configs. + step_config["platforms"].update({ + "clang-cl": step_config["platforms"]["default"], + "clang-cl_large": step_config["platforms"]["default"], + "lld-link": step_config["platforms"]["default"], + }) + + return module( + "config", + step_config = json.encode(step_config), + filegroups = mod.filegroups, + handlers = mod.handlers, + ) diff --git a/patches/chromium/.patches b/patches/chromium/.patches index bed19dbf5165..24b527f93327 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -132,7 +132,6 @@ chore_grandfather_in_electron_views_and_delegates.patch refactor_patch_electron_permissiontypes_into_blink.patch revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch build_partial_revert_mac_fullscreen_top_chrome_mouse_events.patch -revert_update_siso-chromium_image.patch build_set_mac_sdk_minimum_to_10.patch fix_add_macos_memory_query_fallback_to_avoid_crash.patch fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch diff --git a/patches/chromium/revert_update_siso-chromium_image.patch b/patches/chromium/revert_update_siso-chromium_image.patch deleted file mode 100644 index 50ff453b135e..000000000000 --- a/patches/chromium/revert_update_siso-chromium_image.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: deepak1556 -Date: Fri, 27 Jun 2025 02:34:16 +0900 -Subject: Revert "update siso-chromium image" - -This reverts commit b36ef7a445fca58be9a2ebead68bfbda251667ff. - -Reason for revert: -* Requires deployment of new container on our rbe cluster which cannot -happen immediately due to siso transition. -* Helps unblock the roller PRs. -* Image bump was to remove i686 support which doesn't affect us -https://chromium-review.googlesource.com/c/infra/infra/+/6664079 - -diff --git a/build/config/siso/backend_config/google.star b/build/config/siso/backend_config/google.star -index 31b3687d2925325259f33b07754680ba350e3059..348317edc26774168732aacb0fed110c4bbec552 100644 ---- a/build/config/siso/backend_config/google.star -+++ b/build/config/siso/backend_config/google.star -@@ -7,7 +7,7 @@ - load("@builtin//struct.star", "module") - - def __platform_properties(ctx): -- container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a" -+ container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b" - return { - "default": { - "OSFamily": "Linux", -diff --git a/build/config/siso/backend_config/google_cros_chroot.star b/build/config/siso/backend_config/google_cros_chroot.star -index 2763740c7a6b80cc689e745f9af1d7c7ed664d7d..ea1855d8823e4aa31acc920d295d56939efe624d 100644 ---- a/build/config/siso/backend_config/google_cros_chroot.star -+++ b/build/config/siso/backend_config/google_cros_chroot.star -@@ -8,7 +8,7 @@ load("@builtin//struct.star", "module") - - def __platform_properties(ctx): - # LINT.IfChange -- container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a" -+ container_image = "docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b" - - return { - "default": { -diff --git a/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg -index ca8e84948679c7892534fbf793afcec887009c30..6f6e1ca9a0c1385b94aa3b46be5a0a143fc57835 100644 ---- a/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg -+++ b/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg -@@ -1,4 +1,4 @@ --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,label:action_default=1 -+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1 - server_address=unix:///tmp/reproxy.sock - labels=type=compile,compiler=clang,lang=cpp - exec_strategy=racing -diff --git a/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg -index d1ed4fe108a4b954e0f933d12e5308170f357548..12ae5379c2fe6ff2ae9473703730d87fdcc52b3f 100644 ---- a/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg -+++ b/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg -@@ -1,4 +1,4 @@ --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,label:action_default=1 -+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1 - server_address=unix:///tmp/reproxy.sock - labels=type=tool - exec_strategy=remote_local_fallback -diff --git a/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg -index c6c29e29031f38ef172468ade17fde29d648d85d..e73e2e6c7a1876678c547f0f686f817ef03bfd65 100644 ---- a/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg -+++ b/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg -@@ -1,5 +1,5 @@ - # LINT.IfChange --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 -+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 - # LINT.ThenChange(/build/config/siso/backend_config/google_cros_chroot.star) - server_address=unix:///tmp/reproxy.sock - labels=type=compile,compiler=clang,lang=cpp -diff --git a/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg -index 41279923537cc42505e9e47301afe0dec7095c05..918fc9cb47afc8ec8f6b7e060504da7108aa0f91 100644 ---- a/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg -+++ b/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg -@@ -1,4 +1,4 @@ --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 -+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 - server_address=unix:///tmp/reproxy.sock - labels=type=tool - exec_strategy=remote_local_fallback -diff --git a/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg -index 237af4b723b7b269a97cdf57ecdf4a1cfcd0d76a..6eb61b9ac0d03a0983964d1334389e09d091f4d5 100644 ---- a/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg -+++ b/buildtools/reclient_cfgs/linux_cros/chromium-browser-clang/rewrapper_linux.cfg -@@ -1,5 +1,5 @@ - # Configuration for the ChromeOS build using Chrome's bundled toolchain. --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 -+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 - server_address=unix:///tmp/reproxy.sock - labels=type=compile,compiler=clang,lang=cpp - exec_strategy=remote_local_fallback -diff --git a/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg b/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg -index b2579800ff1ae44737c1aa8034923e060999c944..f8332cd84bbc495e161193cd242302c659748596 100644 ---- a/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg -+++ b/buildtools/reclient_cfgs/linux_cros/python/rewrapper_linux.cfg -@@ -1,5 +1,5 @@ - # Configuration file for Python actions in the ChromeOS build. --platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:d7cb1ab14a0f20aa669c23f22c15a9dead761dcac19f43985bf9dd5f41fbef3a,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 -+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2 - server_address=unix:///tmp/reproxy.sock - labels=type=tool - exec_strategy=remote_local_fallback diff --git a/script/actions/move-artifacts.sh b/script/actions/move-artifacts.sh index cf0d0f9126df..1c35977a5168 100755 --- a/script/actions/move-artifacts.sh +++ b/script/actions/move-artifacts.sh @@ -113,5 +113,8 @@ mv_if_exist src/out/Default/hunspell_dictionaries.zip mv_if_exist src/cross-arch-snapshots cp_if_exist src/out/electron_ninja_log cp_if_exist src/out/Default/.ninja_log +if [ -n "$SISO_REPORT_PATH" ]; then + cp_if_exist "$SISO_REPORT_PATH" +fi move_src_dirs_if_exist diff --git a/script/node/generate_original_fs.py b/script/node/generate_original_fs.py index c2a54ac7ab7c..3d458a098bd2 100644 --- a/script/node/generate_original_fs.py +++ b/script/node/generate_original_fs.py @@ -16,10 +16,6 @@ for fs_file in fs_files: 'lib/original-fs.js').replace('lib/fs/', 'lib/original-fs/') - with open(os.path.join(out_dir, fs_file), 'w', encoding='utf-8' - ) as original_f: - original_f.write(contents) - with open(os.path.join(out_dir, original_fs_file), 'w', encoding='utf-8') as transformed_f: transformed_contents = contents.replace('internal/fs/',