Update to latest build-tools
This commit is contained in:
Родитель
24e2e2f815
Коммит
650e26f9e8
|
@ -72,7 +72,7 @@ if (!skipGclient) {
|
||||||
const BUILD_TOOLS_URL = 'https://github.com/electron/build-tools'
|
const BUILD_TOOLS_URL = 'https://github.com/electron/build-tools'
|
||||||
const buildToolsDir = path.join('vendor', 'build-tools')
|
const buildToolsDir = path.join('vendor', 'build-tools')
|
||||||
if (fs.existsSync(buildToolsDir)) {
|
if (fs.existsSync(buildToolsDir)) {
|
||||||
execSync('git checkout master', {stdio: 'pipe', cwd: buildToolsDir})
|
execSync('git checkout main', {stdio: 'pipe', cwd: buildToolsDir})
|
||||||
execSync('git pull', {stdio: 'pipe', cwd: buildToolsDir})
|
execSync('git pull', {stdio: 'pipe', cwd: buildToolsDir})
|
||||||
} else {
|
} else {
|
||||||
execSync(`git clone ${BUILD_TOOLS_URL} ${buildToolsDir}`)
|
execSync(`git clone ${BUILD_TOOLS_URL} ${buildToolsDir}`)
|
||||||
|
|
4
build.js
4
build.js
|
@ -20,8 +20,8 @@ let jobs = os.cpus().length
|
||||||
const useGoma = fs.readFileSync(outDir + '/args.gn').toString().includes('goma.gn')
|
const useGoma = fs.readFileSync(outDir + '/args.gn').toString().includes('goma.gn')
|
||||||
if (useGoma) {
|
if (useGoma) {
|
||||||
const goma = require('./vendor/build-tools/src/utils/goma')
|
const goma = require('./vendor/build-tools/src/utils/goma')
|
||||||
goma.auth({gomaOneForAll: true})
|
goma.auth({goma: 'cluster'})
|
||||||
goma.ensure()
|
goma.ensure({goma: 'cluster'})
|
||||||
jobs = 200
|
jobs = 200
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче