Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Bazel 1.1 #1142

Merged
merged 17 commits into from
Nov 14, 2019
Merged

Update to Bazel 1.1 #1142

merged 17 commits into from
Nov 14, 2019

Conversation

aherrmann
Copy link
Member

@aherrmann aherrmann commented Nov 13, 2019

depends on #1141 change base branch before merging

This is based on and replaces #1065.

  • Updates nixpkgs to include Bazel 1.1.
  • Updates the Stackage snapshot as in Bump stackage nixpkgs + bazel 0.29 #1065 .
  • Updates rules_nixpkgs to include nixpkgs_python_configure.
  • Uses nixpkgs_python_configure to avoid issues with the Python toolchain as described in Bump stackage nixpkgs + bazel 0.29 #1065.
  • Uses the nixpkgs platform constraint defined by rules_nixpkgs instead of defining its own.
    Defines an alias to be backwards compatible to users depending on that platform constraint.

Closes #1065.

@aherrmann aherrmann force-pushed the bazel-1.1 branch 2 times, most recently from b52aa23 to ef5c7c0 Compare November 13, 2019 15:05
@aherrmann aherrmann changed the base branch from master to pipeline-bazel-version November 14, 2019 08:56
@aherrmann aherrmann marked this pull request as ready for review November 14, 2019 09:00
# XXX: see .bazelrc note [backward compatible options] for rational behind
# the --incompatible_use_python_toolchains flag
bazel build --incompatible_use_python_toolchains=false //docs:api_html
# XXX: Remove --host_force_python=PY2 after updating to Starlark 0.4.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's Starlark 0.4? Is the language now versioned separately from Bazel?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes below suggest you meant Stardoc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Yes, I meant stardoc.

WORKSPACE Outdated
#)
nixpkgs_package(
name = "python3",
attribute_path = "python3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I believe this line is line is redundant.

# XXX: see .bazelrc note [backward compatible options] for rational behind
# the --incompatible_use_python_toolchains flag
bazel build --incompatible_use_python_toolchains=false //docs:api_html
# XXX: Remove --host_force_python=PY2 after updating to Starlark 0.4.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes below suggest you meant Stardoc.

WORKSPACE Outdated
)

nixpkgs_python_configure(
# XXX: Remove python2_attribute_path after updating to Starlark 0.4.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above: did you mean Stardoc?

strip_prefix = "rules_nixpkgs-0.5.2",
urls = ["https://github.com/tweag/rules_nixpkgs/archive/v0.5.2.tar.gz"],
sha256 = "b13cb651e972b3aa06bab75603923071d7647c9ee3f8acb707e3831aa606e911",
strip_prefix = "rules_nixpkgs-bdc802f8e716c66d50cc91f7ad22505edf13c48b",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we should cut a new release of upstream.

@aherrmann aherrmann force-pushed the pipeline-bazel-version branch from d982e79 to e562d98 Compare November 14, 2019 15:03
@jwiegley jwiegley force-pushed the pipeline-bazel-version branch from e562d98 to 63218cd Compare November 14, 2019 15:15
@aherrmann aherrmann changed the base branch from pipeline-bazel-version to master November 14, 2019 15:35
guibou and others added 12 commits November 14, 2019 16:35
Nixpkgs `haskellPackages` provides `proto-lens-protoc` 0.5. `proto-lens`
0.5 appears in stackage `lts-14`.
To include nixpkgs_python_configure
The examples and tutorial repository have been added to `.bazelignore`
before, however, the local repositories remained defined. These are not
used anywhere and can be removed.
The skydoc repository has been deprecated, see
https://github.com/bazelbuild/skydoc/releases/tag/0.3.0

Skydoc has also been deprecated in favor of Stardoc, however the API
changed, so we're not updating to Stardoc 0.4.0, yet.
@aherrmann aherrmann added the merge-queue merge on green CI label Nov 14, 2019
@mergify mergify bot merged commit a9363e8 into master Nov 14, 2019
@mergify mergify bot deleted the bazel-1.1 branch November 14, 2019 15:53
@mergify mergify bot removed the merge-queue merge on green CI label Nov 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants