From 8342ea9f1331e8bf6c266f2c7d0d7a9a93b683ca Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Sat, 19 Nov 2022 07:46:10 +0000 Subject: [PATCH] build: force ninja binary to the right arch after src cache restore Co-authored-by: Samuel Attard --- .circleci/config/base.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index b40dc70110726..fafb8818978e5 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -494,6 +494,11 @@ step-fix-sync: &step-fix-sync # Remove extra output from calling gclient getdep which always calls update_depot_tools sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file + + # Fix ninja (wrong binary) + echo 'infra/3pp/tools/ninja/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/tools/ninja/${platform}'` > ninja_ensure_file + sed -i '' "s/Updating depot_tools... //g" ninja_ensure_file + cipd ensure --root src/third_party/ninja -ensure-file ninja_ensure_file fi cd src/third_party/angle