Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(NA): upgrades iBazel to v0.15.10 #97489

Merged
merged 4 commits into from
Apr 20, 2021
Merged

chore(NA): upgrades iBazel to v0.15.10 #97489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1734455
chore(NA): upgrade into last ibazel version
mistic Apr 15, 2021
a7c6855
chore(NA): upgrade into latest ibazel version
mistic Apr 16, 2021
c6b2a9a
Merge remote-tracking branch 'upstream/master' into upgrade-ibazel-0.…
mistic Apr 19, 2021
9284851
Merge branch 'master' into upgrade-ibazel-0.15.9
kibanamachine Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
"@babel/runtime": "^7.12.5",
"@babel/traverse": "^7.12.12",
"@babel/types": "^7.12.12",
"@bazel/ibazel": "^0.14.0",
"@bazel/ibazel": "^0.15.10",
"@bazel/typescript": "^3.2.3",
"@cypress/snapshot": "^2.1.7",
"@cypress/webpack-preprocessor": "^5.6.0",
Expand Down
10 changes: 8 additions & 2 deletions packages/kbn-pm/dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48512,7 +48512,13 @@ async function runBazel(bazelArgs, offline = false, runOpts = {}) {
await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
}
async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
const extendedEnv = _objectSpread({
IBAZEL_USE_LEGACY_WATCHER: '0'
}, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);

await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
env: extendedEnv
}));
}

/***/ }),
Expand Down Expand Up @@ -59743,7 +59749,7 @@ const WatchBazelCommand = {
// Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
// Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment

await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build'], runOffline);
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
}

};
Expand Down
5 changes: 4 additions & 1 deletion packages/kbn-pm/src/commands/watch_bazel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ export const WatchBazelCommand: ICommand = {
//
// Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
// Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
await runIBazel(['--run_output=false', 'build', '//packages:build'], runOffline);
await runIBazel(
['--run_output=false', 'build', '//packages:build', '--show_result=1'],
runOffline
);
},
};
3 changes: 2 additions & 1 deletion packages/kbn-pm/src/utils/bazel/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@ export async function runIBazel(
offline: boolean = false,
runOpts: execa.Options = {}
) {
await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
const extendedEnv = { IBAZEL_USE_LEGACY_WATCHER: '0', ...runOpts?.env };
await runBazelCommandWithRunner('ibazel', bazelArgs, offline, { ...runOpts, env: extendedEnv });
}
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,10 +1192,10 @@
resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw==

"@bazel/ibazel@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.14.0.tgz#86fa0002bed2ce1123b7ad98d4dd4623a0d93244"
integrity sha512-s0gyec6lArcRDwVfIP6xpY8iEaFpzrSpyErSppd3r2O49pOEg7n6HGS/qJ8ncvme56vrDk6crl/kQ6VAdEO+rg==
"@bazel/ibazel@^0.15.10":
version "0.15.10"
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.15.10.tgz#cf0cff1aec6d8e7bb23e1fc618d09fbd39b7a13f"
integrity sha512-0v+OwCQ6fsGFa50r6MXWbUkSGuWOoZ22K4pMSdtWiL5LKFIE4kfmMmtQS+M7/ICNwk2EIYob+NRreyi/DGUz5A==

"@bazel/typescript@^3.2.3":
version "3.2.3"
Expand Down