Merge branch 'master' into set-exec-constraints

bazelbuild · Oct 28, 2021 · ba39da9 · ba39da9
2 parents eaba7a7 + 6b7cab1
commit ba39da9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -241,7 +241,7 @@ platform(
 See [here](https://github.com/bazelbuild/bazel-toolchains/blob/dac71231098d891e5c4b74a2078fe9343feef510/rules/exec_properties/exec_properties.bzl#L143)
 for a list of parameters accepted by `create_rbe_exec_properties_dict`.
 
-Finally, in your [`.bazelrc`][#bazelrc] file, replace all options specifying a platform target with
+Finally, in your `.bazelrc` file, replace all options specifying a platform target with
 the above custom platform target instead. So for example, if your `.bazelrc` previously looked like
 
 ```bash

diff --git a/pkg/rbeconfigsgen/rbeconfigsgen.go b/pkg/rbeconfigsgen/rbeconfigsgen.go
@@ -241,9 +241,9 @@ func workdir(os string) string {
 func BazeliskDownloadInfo(os string) (string, string, error) {
 	switch os {
 	case OSLinux:
-		return "https://github.com/bazelbuild/bazelisk/releases/download/v1.7.4/bazelisk-linux-amd64", "bazelisk", nil
+		return "https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64", "bazelisk", nil
 	case OSWindows:
-		return "https://github.com/bazelbuild/bazelisk/releases/download/v1.7.4/bazelisk-windows-amd64.exe", "bazelisk.exe", nil
+		return "https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-windows-amd64.exe", "bazelisk.exe", nil
 	}
 	return "", "", fmt.Errorf("invalid OS %q", os)
 }