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

Step 4: Bump bazel on windows to llvm11 #115

Merged
merged 2 commits into from
Jan 4, 2021

Conversation

wrowe
Copy link
Contributor

@wrowe wrowe commented Nov 21, 2020

Build bazel 3.7.2, Windows llvm 11.0.0-based toolchain

  • Step 1 had introduced bazel 3.7.2 in Step 1, build 3.7.2 bazel toolchains #114 for envoy
  • Step 2 bumped .bazelversion to pick up bazel 3.7.2 in Step 2: Bump bazel 3.7.2 in envoy build tree envoy#14134
  • Step 3, we've let all builds in-flight using bazel 3.6.0 to run to completion.
  • in Step 4, we add llvm 11.0.0 to the windows build tools, and reduce the target flavors of bazel to 3.7.2 alone
  • afterward the toolchains are regenerated, we can proceed to step 5 of adding llvm 11.0.0 CI pipeline

Co-authored-by: Sunjay Bhatia sunjayb@vmware.com

@wrowe wrowe requested a review from a team November 21, 2020 01:39
@wrowe wrowe marked this pull request as draft November 21, 2020 01:39
@wrowe
Copy link
Contributor Author

wrowe commented Nov 21, 2020

This PR is also a draft, and at this point may fail CI altogether. Steps documented above.

@@ -38,7 +38,7 @@ esac

# Bazel query is the right command so bazel won't fail itself.
# Keep bazel versions here at most two: current master version, next version
for BAZEL_VERSION in "3.6.0" "3.7.0"; do
for BAZEL_VERSION in "3.7.2"; do
Copy link
Contributor Author

Choose a reason for hiding this comment

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

At time of applying this patch, the transition will be from 3.6.0+3.7.2 -> only 3.7.2

because on windows, the build will fail if we attempt to regenerate 3.6.0 after upgrading llvm to 11.0.0 on windows.

Copy link
Member

Choose a reason for hiding this comment

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

sgtm

@wrowe wrowe marked this pull request as ready for review December 17, 2020 20:37
- Toolchains built on our Windows docker image containing llvm 11.0.0
  cannot be built for or built with any older version of bazel such as 3.6.0
- Rebased due to very confused merge.

Following this build, we need to add the next target flavor of bazel,
e.g. 4.0.0 as a 2nd item once again.

Co-authored-by: William A Rowe Jr <wrowe@vmware.com>
Co-authored-by: Sunjay Bhatia <sunjayb@vmware.com>
Signed-off-by: William A Rowe Jr <wrowe@vmware.com>
Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@wrowe wrowe force-pushed the bump-bazel-llvm11 branch from 3e12331 to 3f0d9c7 Compare December 17, 2020 22:33
@wrowe
Copy link
Contributor Author

wrowe commented Dec 17, 2020

Sorry for the force push, it was quite confused by the merge to master

@wrowe wrowe mentioned this pull request Dec 18, 2020
@lizan lizan merged commit 11efa56 into envoyproxy:master Jan 4, 2021
htuch pushed a commit that referenced this pull request Jan 4, 2021
  [skip ci]
  Step 4, build only 3.7.2, lets us go live with llvm 11.0.0 (#115)

- Toolchains built on our Windows docker image containing llvm 11.0.0
  cannot be built for or built with any older version of bazel such as 3.6.0
- Rebased due to very confused merge.

Following this build, we need to add the next target flavor of bazel,
e.g. 4.0.0 as a 2nd item once again.

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Co-authored-by: William A Rowe Jr <wrowe@vmware.com>
htuch pushed a commit that referenced this pull request Jan 4, 2021
  [skip ci]
  Regenerate linux toolchains from 11efa56

  [skip ci]
  Step 4, build only 3.7.2, lets us go live with llvm 11.0.0 (#115)

- Toolchains built on our Windows docker image containing llvm 11.0.0
  cannot be built for or built with any older version of bazel such as 3.6.0
- Rebased due to very confused merge.

Following this build, we need to add the next target flavor of bazel,
e.g. 4.0.0 as a 2nd item once again.

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Co-authored-by: William A Rowe Jr <wrowe@vmware.com>
@wrowe wrowe deleted the bump-bazel-llvm11 branch January 4, 2021 23:16
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.

2 participants