github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix(NA): propagation of env vars on forced yarn installs (#128021) (#128032)

Browse source 
Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 6e52d0dbef)

# Conflicts:
#	packages/kbn-pm/dist/index.js
#	packages/kbn-pm/src/commands/bootstrap.ts

Co-authored-by: Tiago Costa <tiago.costa@elastic.co>
This commit is contained in:
Spencer 2022-03-17 19:33:53 -07:00 • committed by GitHub
parent 8e9189b417
commit 55aa9f4311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/kbn-pm/dist/index.js vendored
View file

@ -8931,7 +8931,12 @@ const BootstrapCommand = {
if (forceInstall) {
const forceInstallStartTime = Date.now();
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@nodejs//:yarn'], runOffline);
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@nodejs//:yarn'], runOffline, {
env: {
SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
}
});
timings.push({
id: 'force install dependencies',
ms: Date.now() - forceInstallStartTime

9
packages/kbn-pm/src/commands/bootstrap.ts
View file

@ -71,7 +71,14 @@ export const BootstrapCommand: ICommand = {
if (forceInstall) {
const forceInstallStartTime = Date.now();
await runBazel(['run', '@nodejs//:yarn'], runOffline);
await runBazel(['run', '@nodejs//:yarn'], runOffline, {
env: {
SASS_BINARY_SITE:
'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
RE2_DOWNLOAD_MIRROR:
'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
},
});
timings.push({
id: 'force install dependencies',
ms: Date.now() - forceInstallStartTime,