Skip to content

Commit fb92f5d

Browse files
devversionAndrewKushnir
devversion
authored and
AndrewKushnir
committed
build: fix @bazel/bazel to bazelisk leftovers (#36132)
A few leftovers from from `@bazel/bazel` to `@bazel/bazelisk` migration are still there. This commit fixes those, so that the repository no longer relies on `@bazel/bazel`. PR Close #36132
1 parent e342ffd commit fb92f5d

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎.vscode/recommended-launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"name": "IVY:packages/core/test/acceptance",
3535
"type": "node",
3636
"request": "launch",
37-
"program": "${workspaceFolder}/node_modules/.bin/bazel",
37+
"program": "${workspaceFolder}/node_modules/.bin/bazelisk",
3838
"args": [
3939
"test",
4040
"--config=ivy",
@@ -51,7 +51,7 @@
5151
"name": "IVY:packages/core/test/render3",
5252
"type": "node",
5353
"request": "launch",
54-
"program": "${workspaceFolder}/node_modules/.bin/bazel",
54+
"program": "${workspaceFolder}/node_modules/.bin/bazelisk",
5555
"args": [
5656
"test",
5757
"--config=ivy",
@@ -68,7 +68,7 @@
6868
"name": "IVY:packages/core/test",
6969
"type": "node",
7070
"request": "launch",
71-
"program": "${workspaceFolder}/node_modules/.bin/bazel",
71+
"program": "${workspaceFolder}/node_modules/.bin/bazelisk",
7272
"args": [
7373
"test",
7474
"--config=ivy",

‎.vscode/recommended-tasks.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"label": "IVY:packages/core/test/...",
88
"type": "shell",
9-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
9+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
1010
"args": [
1111
"test",
1212
"--config=ivy",
@@ -23,7 +23,7 @@
2323
{
2424
"label": "VE:packages/core/test/...",
2525
"type": "shell",
26-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
26+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
2727
"args": [
2828
"test",
2929
"packages/core/test",
@@ -39,7 +39,7 @@
3939
{
4040
"label": "IVY:packages/core/test/acceptance",
4141
"type": "shell",
42-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
42+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
4343
"args": [
4444
"test",
4545
"--config=ivy",
@@ -54,7 +54,7 @@
5454
{
5555
"label": "VE:packages/core/test/acceptance",
5656
"type": "shell",
57-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
57+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
5858
"args": [
5959
"test",
6060
"packages/core/test/acceptance",
@@ -68,7 +68,7 @@
6868
{
6969
"label": "IVY:packages/core/test",
7070
"type": "shell",
71-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
71+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
7272
"args": [
7373
"test",
7474
"--config=ivy",
@@ -83,7 +83,7 @@
8383
{
8484
"label": "VE:packages/core/test",
8585
"type": "shell",
86-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
86+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
8787
"args": [
8888
"test",
8989
"packages/core/test",
@@ -97,7 +97,7 @@
9797
{
9898
"label": "IVY:packages/core/test/render3",
9999
"type": "shell",
100-
"command": "${workspaceFolder}/node_modules/.bin/bazel",
100+
"command": "${workspaceFolder}/node_modules/.bin/bazelisk",
101101
"args": [
102102
"test",
103103
"--config=ivy",

‎scripts/release/publish-latest‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ set -u -e -o pipefail
77
# Publish them to npm (tagged next)
88

99
# We need to resolve the Bazel binary in the node modules because running Bazel
10-
# through `yarn bazel` causes additional output that throws off the command stdout.
11-
BAZEL_BIN=$(yarn bin)/bazel
10+
# through `yarn bazelisk` causes additional output that throws off the command stdout.
11+
BAZEL_BIN=$(yarn bin)/bazelisk
1212
# Build into a distinct output location so that artifacts from previous builds are not reused
1313
BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-latest.XXXXXXX)
1414
BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE"

‎scripts/release/publish-next‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ set -u -e -o pipefail
77
# Publish them to npm (tagged next)
88

99
# We need to resolve the Bazel binary in the node modules because running Bazel
10-
# through `yarn bazel` causes additional output that throws off the command stdout.
11-
BAZEL_BIN=$(yarn bin)/bazel
10+
# through `yarn bazelisk` causes additional output that throws off the command stdout.
11+
BAZEL_BIN=$(yarn bin)/bazelisk
1212
# Build into a distinct output location so that artifacts from previous builds are not reused
1313
BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-next.XXXXXXX)
1414
BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE"

0 commit comments

Comments
 (0)