Skip to content

Commit

Permalink
Bazel config maintenance (#135442)
Browse files Browse the repository at this point in the history
* Bazel config maintenance

- Removes node.js s390x - not a supported platform
- Updates the list of ignored bazel folders
- Updates yarn to 1.22.19, we're on a 2.5 year old version

* bump yarn in package.json
  • Loading branch information
jbudz authored Jul 5, 2022
1 parent 97670ad commit 5460e38
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
10 changes: 10 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,26 @@
# Issues are opened for to include that feature but not available yet
# https://github.com/bazelbuild/bazel/issues/7093
# https://github.com/bazelbuild/bazel/issues/8106
.buildkite
.ci
.chromium
.git
.github
.idea
.native_modules
.teamcity
.yarn-local-mirror
.vscode
api_docs
bazel-bin
bazel-kibana
bazel-out
bazel-testlogs
build
data
dev_docs
docs
legacy_rfcs
node_modules
target
vars
9 changes: 2 additions & 7 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,11 @@ http_archive(
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")

# Setup the Node.js toolchain for the architectures we want to support
#
# NOTE: darwin-arm64 is not being installed because bazel is not yet available on that architecture.
# The PR for it was merged and should be available in the next release of bazel and bazelisk. As soon as they have it
# we can update that rule.
node_repositories(
node_repositories = {
"16.14.2-darwin_amd64": ("node-v16.14.2-darwin-x64.tar.gz", "node-v16.14.2-darwin-x64", "d3076ca7fcc7269c8ff9b03fe7d1c277d913a7e84a46a14eff4af7791ff9d055"),
"16.14.2-darwin_arm64": ("node-v16.14.2-darwin-arm64.tar.gz", "node-v16.14.2-darwin-arm64", "a66d9217d2003bd416d3dd06dfd2c7a044c4c9ff2e43a27865790bd0d59c682d"),
"16.14.2-linux_arm64": ("node-v16.14.2-linux-arm64.tar.xz", "node-v16.14.2-linux-arm64", "f7c5a573c06a520d6c2318f6ae204141b8420386553a692fc359f8ae3d88df96"),
"16.14.2-linux_s390x": ("node-v16.14.2-linux-s390x.tar.xz", "node-v16.14.2-linux-s390x", "3197925919ca357e17a31132dc6ef4e5afae819fa09905cfe9f7ff7924a00bf5"),
"16.14.2-linux_amd64": ("node-v16.14.2-linux-x64.tar.xz", "node-v16.14.2-linux-x64", "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b"),
"16.14.2-windows_amd64": ("node-v16.14.2-win-x64.zip", "node-v16.14.2-win-x64", "4731da4fbb2015d414e871fa9118cabb643bdb6dbdc8a69a3ed563266ac93229"),
},
Expand All @@ -38,9 +33,9 @@ node_repositories(
"https://nodejs.org/dist/v{version}/{filename}",
],
yarn_repositories = {
"1.21.1": ("yarn-v1.21.1.tar.gz", "yarn-v1.21.1", "d1d9f4a0f16f5ed484e814afeb98f39b82d4728c6c8beaafb5abc99c02db6674"),
"1.22.19": ("yarn-v1.22.19.tar.gz", "yarn-v1.22.19", "732620bac8b1690d507274f025f3c6cfdc3627a84d9642e38a07452cc00e0f2e"),
},
yarn_version = "1.21.1",
yarn_version = "1.22.19",
yarn_urls = [
"https://github.com/yarnpkg/yarn/releases/download/v{version}/{filename}",
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
"engines": {
"node": "16.14.2",
"yarn": "^1.21.1"
"yarn": "^1.22.19"
},
"resolutions": {
"**/@babel/runtime": "^7.17.9",
Expand Down

0 comments on commit 5460e38

Please sign in to comment.