Update Bazel 2.1.0 --> 3.3.1#6761
Merged
aherrmann-da merged 15 commits intomasterfrom Jul 23, 2020
Merged
Conversation
aherrmann-da
force-pushed
the
bazel-update
branch
3 times, most recently
from
1e72a5c to
d015dd5
Compare
aherrmann-da
force-pushed
the
bazel-update
branch
8 times, most recently
from
8e8d3ad to
c744ef9
Compare
It used to be used as a gateway to push the Nix cache to GCS, but has since been replaced by nix-store-gcs-proxy.
changelog_begin changelog_end
The nixpkgs update implied an hlint update which enabled new warnings.
Since Bazel 2.2.0 the order of generating `WORKSPACE` and `BUILD` files and applying patches has been reversed. The allows users to define patches to these files that will not be immediately overwritten. However, it also means that patches on another repository's original `WORKSPACE` file will likely become invalid. * bazelbuild/bazel@a948eb7 * bazelbuild/bazel#10681 Hint: If you're generating a patch with `git` then you can use the following command to exclude the `WORKSPACE` file. ``` git diff ':(exclude)WORKSPACE' ```
client_server_test used to produce an executable shell script in form of a text file output. However, since the removal of `--noincompatible_windows_native_test_wrapper` this no longer works on Windows since `.sh` files are not directly executable on Windows. This change fixes the issue by producing the script file in a dedicated rule and then wrapping it in a `sh_test` rule which also works on Windows.
aherrmann-da
force-pushed
the
bazel-update
branch
from
60f316f to
9f9aba5
Compare
Remove `clean --expunge` after merge.
aherrmann-da
force-pushed
the
bazel-update
branch
from
9f9aba5 to
e5dfc1c
Compare
aherrmann-da
requested review from
cocreature,
garyverhaegen-da,
gerolf-da,
hurryabit and
rautenrieth-da
as code owners
cocreature
approved these changes
Jul 23, 2020
Contributor
cocreature
left a comment
cocreature
left a comment
There was a problem hiding this comment.
Great work, thank you so much!
| @@ -200,71 +200,23 @@ index 721f64d..3ee682b 100644 | |||
| Example: | |||
Contributor
There was a problem hiding this comment.
Would be great to get this merged upstream.
Contributor
Author
There was a problem hiding this comment.
Yes, upstream PRs are here tweag/rules_nixpkgs#132, tweag/rules_nixpkgs#128. I've factored out the nixopts location expansion into its own PR to ease review.
| newtype DamlOption = DamlOption FilePath | ||
| instance IsOption DamlOption where | ||
| defaultValue = DamlOption $ "daml" | ||
| defaultValue = DamlOption "daml" |
Contributor
There was a problem hiding this comment.
huh, I wonder what caused hlint to not catch this before, maybe haskell-src-exts just couldn’t parse anything in this file.
garyverhaegen-da
added a commit
that referenced
this pull request
Jul 23, 2020
Following #6761, all nodes have been reset, so we can get back to fast, cached builds. CHANGELOG_BEGIN CHANGELOG_END
garyverhaegen-da
added a commit
that referenced
this pull request
Jul 24, 2020
Following #6761, all nodes have been reset, so we can get back to fast, cached builds. CHANGELOG_BEGIN CHANGELOG_END
garyverhaegen-da
added a commit
that referenced
this pull request
Sep 4, 2020
It looks like the structure of the nix package has changed when we updated nixpkgs in #6761, so we need to update the dev-env script to match. CHANGELOG_BEGIN CHANGELOG_END
Merged
garyverhaegen-da
added a commit
that referenced
this pull request
Sep 4, 2020
It looks like the structure of the nix package has changed when we updated nixpkgs in #6761, so we need to update the dev-env script to match. CHANGELOG_BEGIN CHANGELOG_END
garyverhaegen-da
added a commit
that referenced
this pull request
Sep 10, 2020
It looks like #6761 broke our Terraform setup by upgrading the nixpkgs snapshot. That this has not been caught earlier is, I suppose, a testament to how stable our infrastructure has become nowadays. This is the same issue we had with the Google providers in #6402, i.e. we are trying to pin the provider versions both at the nix level and at the terraform level, with no way to force them to stay in sync. I don't have a good proposal for such a way, and it seems rare and innocuous enough to not warrant the investment to fix this at a more fundamental level. CHANGELOG_BEGIN CHANGELOG_END
Merged
garyverhaegen-da
added a commit
that referenced
this pull request
Sep 10, 2020
It looks like #6761 broke our Terraform setup by upgrading the nixpkgs snapshot. That this has not been caught earlier is, I suppose, a testament to how stable our infrastructure has become nowadays. This is the same issue we had with the Google providers in #6402, i.e. we are trying to pin the provider versions both at the nix level and at the terraform level, with no way to force them to stay in sync. I don't have a good proposal for such a way, and it seems rare and innocuous enough to not warrant the investment to fix this at a more fundamental level. CHANGELOG_BEGIN CHANGELOG_END
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
miniowhich failed to build on MacOS after the update.hlintwarnings due to the more recent version ofhlintprovided by the more recent nixpkgs revision.rules_nixpkgs- the hermetic cc toolchain had to be updated for Bazel 3.3.1--noincompatible_windows_native_test_wrapperwas removed in Bazel.We had some custom test rules that wrote an executable shell script
.sh. This worked because Bazel executed tests in a shell wrapper. In recent versions this is no longer the case on Windows and tests have to be standalone executables.To work around this issue this introduces a more general
sh_inline_testrule that allows to specify a test shell script as an attribute. Internally it combines a dedicated rule that writes the script into a file and passes it to the builtinsh_testrule.This triggered sh_binary has multiple outputs in some contexts bazelbuild/bazel#11820 and required an additional workaround to find the
.exeoutputsh_binaryclient's ofclient_server_teston Windows.clean --expungeat the beginning to avoid interference with the previous Bazel version. Theclean --expungecan be removed once this is merged.Pull Request Checklist
CHANGELOG_BEGINandCHANGELOG_ENDtagsNOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines runtotrigger the build.