From c8544e25dffd7a7ca6133e00518afa72fc976c63 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Mon, 18 Sep 2023 16:43:27 -0400 Subject: [PATCH] build: fixup autoninja (#39896) chore: set GOMA_DIR for autoninja (cherry picked from commit 94f24bde4dd19764fbbae083f5970b007c9dc8b2) (cherry picked from commit 90c1f6e1cb8d22d94dd01791dc4b9c3e0a7e86fc) --- .circleci/config/base.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 3626c8ff9464..c16e18c240c3 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -354,7 +354,7 @@ step-setup-goma-for-build: &step-setup-goma-for-build exit 1 fi echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV - echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV + echo 'export GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV cd .. touch "${TMPDIR:=/tmp}"/.goma-ready @@ -749,8 +749,8 @@ step-show-goma-stats: &step-show-goma-stats command: | set +e set +o pipefail - $LOCAL_GOMA_DIR/goma_ctl.py stat - $LOCAL_GOMA_DIR/diagnose_goma_log.py + $GOMA_DIR/goma_ctl.py stat + $GOMA_DIR/diagnose_goma_log.py true when: always background: true