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

Generate Windows toolchain config #64

Merged
merged 8 commits into from
May 26, 2020
Merged

Generate Windows toolchain config #64

merged 8 commits into from
May 26, 2020

Conversation

sunjayBhatia
Copy link
Member

  • To allow Linux and Windows toolchain configs to coexist, generate different platforms into
    toolchains/configs/${OS_FAMILY}
  • Bumps bazel-toolchains dependency to 3.1.2 for Windows changes
  • Remove all toolchains so CI regenerates them
  • Reorder pipeline jobs to be serial, eliminates race between Linux and
    Windows toolchain generation jobs pushing to envoy-build-tools master

@sunjayBhatia
Copy link
Member Author

cc @wrowe

- Generate different platforms into toolchains/configs/${OS_FAMILY}
- Bumps bazel-toolchains dependency to 3.1.2 for Windows changes
- Remove all toolchains so CI regenerates them
- Reorder pipeline jobs to be serial, eliminates race between Linux and
  Windows toolchain generation jobs pushing to envoy-build-tools master

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
@sunjayBhatia
Copy link
Member Author

@lizan when you get a chance, we would appreciate a review of this PR

@sunjayBhatia
Copy link
Member Author

sunjayBhatia commented May 21, 2020

Windows CI run should be fixed by bazelbuild/bazel-toolchains#877, will bump to a version with that once it is ready

sunjayBhatia and others added 3 commits May 21, 2020 20:39
Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
sunjayBhatia and others added 2 commits May 21, 2020 21:37
Ensures if docker CLI is installed with spaces in path, bash can run the
binary

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
@sunjayBhatia
Copy link
Member Author

The build finished, github seems to not have picked up the hook to change the status of the build here but it did pass: https://dev.azure.com/cncf/envoy/_build/results?buildId=40354&view=logs&j=3140c08e-0ceb-500c-a7fc-1cac300b6d64

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
@sunjayBhatia
Copy link
Member Author

Looks like this went green again but Github missed the success hook on the ubuntu container build job

@sunjayBhatia
Copy link
Member Author

@lizan this should be ready to review again, we can merge master again if you want but there shouldn't be any conflicts. All the checks have passed

@lizan
Copy link
Member

lizan commented May 26, 2020

can you merge master?

…onfig

Co-authored-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
Signed-off-by: Sunjay Bhatia <[email protected]>
Signed-off-by: William A Rowe Jr <[email protected]>
@sunjayBhatia
Copy link
Member Author

@lizan should be good to go with master merged

@lizan lizan merged commit d1e8111 into envoyproxy:master May 26, 2020
htuch pushed a commit that referenced this pull request May 26, 2020
  [skip ci]
  Generate Windows toolchain config (#64)

- To allow Linux and Windows toolchain configs to coexist, generate different platforms into
  toolchains/configs/${OS_FAMILY}
- Bumps bazel-toolchains dependency to 3.1.2 for Windows changes
- Remove all toolchains so CI regenerates them
- Reorder pipeline jobs to be serial, eliminates race between Linux and
  Windows toolchain generation jobs pushing to envoy-build-tools master

Signed-off-by: Sunjay Bhatia <[email protected]>
Co-authored-by: William A Rowe Jr <[email protected]>
@wrowe wrowe deleted the windows-toolchain-config branch June 7, 2020 14:59
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