Define Bazel version in one shared location #1252
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aherrmann
force-pushed
the
bazel-version
branch
2 times, most recently
from
2793e37
to
8bbc94a
Compare
Profpatsch
reviewed
Feb 25, 2020
| # installation, see https://github.com/NixOS/nixpkgs/issues/80950. | ||
| VERSION_EXPECTED="bazel $(cat "$DIR/bazelversion")" | ||
| VERSION_ACTUAL=$(bazel version --gnu_format) | ||
| # nixpkgs Bazel version ends on '- (@non-git)'. |
There was a problem hiding this comment.
Should we fix this in nixpkgs?
There was a problem hiding this comment.
I think that would also fix this issue, so that would be good. Though, I don't think we need to block this PR on it.
There was a problem hiding this comment.
I guess that’s already fixed by the changes in NixOS/nixpkgs#80739 (review)
There was a problem hiding this comment.
IIUC that PR changes bazel-real for bazel-VERSION..., so it fixes NixOS/nixpkgs#80950, but doesn't change the - (@non-git) part. (Unless Bazel 2.1 does that, I haven't checked).
Profpatsch
approved these changes
Feb 25, 2020
Instead of each CI pipeline separately defining the Bazel version, we define it in one shared location `.ci/bazelversion`. Ideally, we would use `.bazelversion` in the top-level which would be compatible with [bazelisk](https://github.com/bazelbuild/bazelisk). Unfortunately, this is incompatible with the way Bazel is packaged in nixpkgs right now. See, `.ci/check-bazel-version`. The pipelines that use nixpkgs to provision Bazel check that the Bazel version matches using `.ci/check-bazel-version`. The pipelines that fetch a Bazel binary distribution use `.ci/fetch-bazel-bindist` which in turn consults the `.ci/bazelversion` file. To avoid issues with corrupted downloads we check the downloaded bindist against expected sha256 hashes defined in `.ci/bazel-sha256`. The files `.ci/bazelversion` and `.ci/bazel-sha256` need to be kept in sync. The script `.ci/update-bazel-version` helps with this. Given a Bazel version number it will update both files. The nixpkgs revision needs to be updated separately. The `MAINTAINERS.md` file has been updated accordingly.
To work around this we store separate `.sha256` files for each platform.
git was automatically converting `\n` lineendings to `\r\n`, which confused `sha256sum`. By declaring `.sha256` files as binary `.gitattributes` we avoid this issue.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of each CI pipeline separately defining the Bazel version, we define it in one shared location
.ci/bazelversion. Ideally, we would use.bazelversionin the top-level which would be compatible with bazelisk. Unfortunately, this is incompatible with the way Bazel is packaged in nixpkgs right now. See NixOS/nixpkgs#80950.The pipelines that use nixpkgs to provision Bazel check that the Bazel version matches using
.ci/check-bazel-version. This was already the case on Linux, but has been added on macOS. The pipelines that fetch a Bazel binary distribution use.ci/fetch-bazel-bindistwhich in turn consults the.ci/bazelversionfile. This was already the case on buildkite, but has been added to netlify and Azure. To avoid issues with corrupted downloads we check the downloaded bindist against expected sha256 hashes defined in.ci/bazel-*.sha256.The files
.ci/bazelversionand.ci/bazel-*.sha256need to be kept in sync. The script.ci/update-bazel-versionhelps with this. Given a Bazel version number it will update both files. The nixpkgs revision needs to be updated separately. TheMAINTAINERS.mdfile has been updated accordingly.