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

Simplify Windows build by not setting PKG_CONFIG_PATH #24005

Merged
merged 3 commits into from Aug 21, 2019

Conversation

@ferjm
Copy link
Member

ferjm commented Aug 19, 2019

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #23177

This change is Reviewable

@highfive
Copy link

highfive commented Aug 19, 2019

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/build_commands.py
@jdm
Copy link
Member

jdm commented Aug 19, 2019

Looks like you made some changes after running test-tidy:


�[94m./python/servo/command_base.py�[0m:�[93m241�[0m: �[91mE302 expected 2 blank lines, found 1�[0m

�[94m./python/servo/command_base.py�[0m:�[93m259�[0m: �[91mE302 expected 2 blank lines, found 1�[0m

�[94m./python/servo/command_base.py�[0m:�[93m588�[0m: �[91mE711 comparison to None should be 'if cond is None:'�[0m
@jdm jdm added the S-fails-tidy label Aug 19, 2019
@jdm
Copy link
Member

jdm commented Aug 19, 2019

@highfive highfive assigned Manishearth and unassigned nox Aug 19, 2019
@Manishearth
Copy link
Member

Manishearth commented Aug 19, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Aug 19, 2019

📌 Commit 34ff759 has been approved by Manishearth

@jdm
Copy link
Member

jdm commented Aug 19, 2019

@bors-servo r-
See previous comment.

@Manishearth
Copy link
Member

Manishearth commented Aug 19, 2019

r=me with tidy :)

@ferjm ferjm force-pushed the ferjm:windows.pkgconfig branch from 34ff759 to 7d16746 Aug 20, 2019
@ferjm ferjm removed the S-fails-tidy label Aug 20, 2019
@ferjm
Copy link
Member Author

ferjm commented Aug 20, 2019

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Aug 20, 2019

📌 Commit 7d16746 has been approved by Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2019

Testing commit 7d16746 with merge 2e0d1ad...

bors-servo added a commit that referenced this pull request Aug 21, 2019
Simplify Windows build by not setting PKG_CONFIG_PATH

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #23177

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24005)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: Manishearth
Pushing 2e0d1ad to master...

@bors-servo bors-servo merged commit 7d16746 into servo:master Aug 21, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

6 participants
You can’t perform that action at this time.