Skip to content
This repository was archived by the owner on Mar 28, 2021. It is now read-only.

Commit 38ab829

Browse files
authored
Revert "build: use one-for-all goma (electron#26679)" (electron#26689)
This reverts commit 6761814.
1 parent 87e20f2 commit 38ab829

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.circleci/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,19 @@ step-setup-goma-for-build: &step-setup-goma-for-build
295295
run:
296296
name: Setup Goma
297297
command: |
298-
echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
298+
if [ "`uname`" == "Linux" ]; then
299+
echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
300+
else
301+
echo 'export NUMBER_OF_NINJA_PROCESSES=25' >> $BASH_ENV
302+
fi
299303
if [ ! -z "$RAW_GOMA_AUTH" ]; then
300304
echo $RAW_GOMA_AUTH > ~/.goma_oauth2_config
301305
fi
302306
git clone https://github.com/electron/build-tools.git
303307
cd build-tools
304308
npm install
305309
mkdir third_party
306-
node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
310+
node -e "require('./src/utils/goma.js').downloadAndPrepare()"
307311
node -e "require('./src/utils/goma.js').ensure()"
308312
echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
309313
echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ build_script:
141141
- cd build-tools
142142
- npm install
143143
- mkdir third_party
144-
- ps: >-
145-
node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
144+
- node -e "require('./src/utils/goma.js').downloadAndPrepare()"
146145
- ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
147146
- ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
148147
- cd ..

0 commit comments

Comments
 (0)