From 3a94634ae559e5e9cc41e26b56af95a3f916a7f9 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Fri, 18 Nov 2022 23:45:22 -0800 Subject: [PATCH] build: force ninja binary to the right arch after src cache restore (#36401) --- .circleci/config/base.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index bfd6567296d5..d28aa683277d 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -495,6 +495,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