From 99f16b0918ccc98cc0e0d68a6d4a84f8bef86611 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Mon, 28 Oct 2019 11:54:20 -0700 Subject: [PATCH] build: update to bazel 1.1.0 --- WORKSPACE | 4 +++- index.bzl | 2 +- internal/check_package_json.js | 2 +- package.json | 2 +- yarn.lock | 44 +++++++++++++++++----------------- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 39e5477149..fa8f0c3bd1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -264,7 +264,9 @@ rbe_autoconfig( load("@build_bazel_integration_testing//tools:repositories.bzl", "bazel_binaries") # Depend on the Bazel binaries -bazel_binaries(versions = ["0.28.1"]) +load("//:index.bzl", "BAZEL_VERSION") + +bazel_binaries(versions = [BAZEL_VERSION]) # # Setup bazel_integration_test repositories diff --git a/index.bzl b/index.bzl index c116da861a..72a829d46e 100644 --- a/index.bzl +++ b/index.bzl @@ -93,7 +93,7 @@ VERSION = "0.39.0" # we will test against multiple versions. # This version should be updated together with the version of the @bazel/bazel # package in package.json. This is asserted in //internal:package_json_test. -BAZEL_VERSION = "0.28.1" +BAZEL_VERSION = "1.1.0" def check_rules_nodejs_version(minimum_version_string): """ diff --git a/internal/check_package_json.js b/internal/check_package_json.js index ec0a1ced2c..21a9f749e0 100644 --- a/internal/check_package_json.js +++ b/internal/check_package_json.js @@ -28,7 +28,7 @@ const packageJson = require('build_bazel_rules_nodejs/package.json'); if (packageJson['devDependencies']['@bazel/bazel'] !== `^${BAZEL_VERSION}`) { console.error(`package.json @bazel/bazel '${ packageJson['devDependencies'] - ['@bazel/bazel']}' does not match BAZEL_VERSION in //:index.bzl '${ + ['@bazel/bazel']}' does not match ^BAZEL_VERSION in //:index.bzl '^${ BAZEL_VERSION}'`); process.exitCode = 1; } diff --git a/package.json b/package.json index 56877344bd..f4ba740bc2 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@babel/cli": "^7.6.2", "@babel/core": "^7.6.2", "@babel/preset-env": "^7.6.2", - "@bazel/bazel": "^0.28.1", + "@bazel/bazel": "^1.1.0", "@bazel/buildifier": "^0.26.0", "@bazel/buildozer": "^0.29.0", "@bazel/hide-bazel-files": "file:./packages/hide-bazel-files", diff --git a/yarn.lock b/yarn.lock index 39fc9ab41f..4be5ffa071 100644 --- a/yarn.lock +++ b/yarn.lock @@ -654,31 +654,31 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@bazel/bazel-darwin_x64@0.28.1": - version "0.28.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.28.1.tgz#415658785e1dbd6f7ab5c8f2b98c1c99c614e1d5" - integrity sha512-VDKWmplAfa4uCAbkIQ5nRn04MFQqtsPNuc2HkluJ8OIum773yC2dPR+OlLBKxrlBuKJYB27TtbOwOa6w/uK7aw== - -"@bazel/bazel-linux_x64@0.28.1": - version "0.28.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.28.1.tgz#f78006089e17660261088272a0e04fc886572e34" - integrity sha512-n4XfNxagYhejQD32V4XSxT/qzuH1l/2jxslbKSak66/uQ+wad8Ew9rjNb4JUin3xtrfFtzmxx2jpQkybZsRVGA== - -"@bazel/bazel-win32_x64@0.28.1": - version "0.28.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.28.1.tgz#60a2819618cf7582cc35ac16c01763a5e807b414" - integrity sha512-T4xksGfKikaHS4zxnGT6r5R436mz9j2lz//L1vc5sJnaEF/1e2Gv6MLl86vfZW2Xxo6iIEi6ntSzgYxP2Blohw== - -"@bazel/bazel@^0.28.1": - version "0.28.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.28.1.tgz#3a6b9b7a74d566c66805242ccaa2f907592b5bff" - integrity sha512-s4bn5/vegEec66l15ZjyUe4jNybQ5J/cg9gFzR5f8deKj8lM+2WtCfvTLO3XfUe2pbrB4BG7C31jpyFPOC+6aw== +"@bazel/bazel-darwin_x64@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-1.1.0.tgz#9402ecadfaf0383bc366ef5b37b933e0d0e804fc" + integrity sha512-/dnpkjqnl2Qrcy+qFerOe+lV9QZ2HoUHtTplQgRxa+OH8AtQ7mcopdJ9/3Y10GqgT2Kp+AR6G99R59/Si+BOMg== + +"@bazel/bazel-linux_x64@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-1.1.0.tgz#98d75240e3e9ff5ba14fa48d6241d5d741e89926" + integrity sha512-yDR1URphRQTkXYjl4U2NLmbGR8ar8imhytK3txZZqlPf5pfWI/7wa7gSg0H4VbRRLIGAy/nD2eXZpgSj1eUiqA== + +"@bazel/bazel-win32_x64@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-1.1.0.tgz#e9c80a8c6495834ee7fc6184c425284d1151ac38" + integrity sha512-mj3ujcifKO+hjAjHvLoutYxzs90YWuc/fYJuVaEQrk4YFrRW5g70OpjN74zzBHRstObOjSZ3cOj+HDB19SIFKw== + +"@bazel/bazel@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-1.1.0.tgz#9ce8308e44d76132812e908fcbc9e9051c7c2e1a" + integrity sha512-3NOWRHG1i/tAVQWuStIUuliFLVfjcKMbqIlc2Q206VWQ5pjlKgo0qa+qrWb0G6BYq+N3hxT4IwBz+Z17A8dbbg== dependencies: "@bazel/hide-bazel-files" latest optionalDependencies: - "@bazel/bazel-darwin_x64" "0.28.1" - "@bazel/bazel-linux_x64" "0.28.1" - "@bazel/bazel-win32_x64" "0.28.1" + "@bazel/bazel-darwin_x64" "1.1.0" + "@bazel/bazel-linux_x64" "1.1.0" + "@bazel/bazel-win32_x64" "1.1.0" "@bazel/buildifier-darwin_x64@0.26.0": version "0.26.0"