From d0b4489b7d3fcbf789dea215d4e93a0e2ea4a894 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Sat, 17 Feb 2024 15:04:36 -0800 Subject: [PATCH] ci: fix helperPath calls in ci configs (#41363) * ci: fix helperPath calls in ci configs Co-authored-by: codebytere * ci: fix helperPaths harder --------- Co-authored-by: codebytere --- .circleci/config/base.yml | 4 ++-- appveyor-woa.yml | 2 +- appveyor.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 31a6b34681..8042719220 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -353,10 +353,10 @@ step-setup-rbe-for-build: &step-setup-rbe-for-build mkdir third_party # Pull down credential helper and print status node -e "require('./src/utils/reclient.js').downloadAndPrepare({})" - HELPER=$(node -p "require('./src/utils/reclient.js').helperPath") + HELPER=$(node -p "require('./src/utils/reclient.js').helperPath({})") $HELPER login echo 'export RBE_service='`node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"` >> $BASH_ENV - echo 'export RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath)"` >> $BASH_ENV + echo 'export RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $BASH_ENV echo 'export RBE_experimental_credentials_helper_args="print"' >> $BASH_ENV step-restore-brew-cache: &step-restore-brew-cache diff --git a/appveyor-woa.yml b/appveyor-woa.yml index 073e9771f0..3723dc5505 100644 --- a/appveyor-woa.yml +++ b/appveyor-woa.yml @@ -106,7 +106,7 @@ for: - mkdir third_party - ps: >- node -e "require('./src/utils/reclient.js').downloadAndPrepare({})" - - ps: $env:RECLIENT_HELPER = node -p "require('./src/utils/reclient.js').helperPath" + - ps: $env:RECLIENT_HELPER = node -p "require('./src/utils/reclient.js').helperPath({})" - ps: >- & $env:RECLIENT_HELPER login - ps: >- diff --git a/appveyor.yml b/appveyor.yml index abbc7ef335..49520ced9a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -104,7 +104,7 @@ for: - mkdir third_party - ps: >- node -e "require('./src/utils/reclient.js').downloadAndPrepare({})" - - ps: $env:RECLIENT_HELPER = node -p "require('./src/utils/reclient.js').helperPath" + - ps: $env:RECLIENT_HELPER = node -p "require('./src/utils/reclient.js').helperPath({})" - ps: >- & $env:RECLIENT_HELPER login - ps: >-