Skip to content

/ servo

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

use cargo manifest path to find build.py #18363

Merged
merged 1 commit into from Sep 5, 2017
Merged

use cargo manifest path to find build.py #18363

merged 1 commit into from Sep 5, 2017
+2 −1

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Sep 4, 2017 •
edited by SimonSapin

Without this, build.py can't be found when servo is built as a dependency.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable
@highfive
Copy link

highfive commented Sep 4, 2017

Heads up! This PR modifies the following files:
@highfive
Copy link

highfive commented Sep 4, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 4, 2017

@bors-servo try

  • Travis: #18346
  • appveyor: Build execution time has reached the maximum allowed time for your plan (90 minutes).
@bors-servo
Copy link
Contributor

bors-servo commented Sep 4, 2017

⌛ Trying commit a18ea7f with merge 282fe90...
bors-servo added a commit that referenced this pull request Sep 4, 2017
@bors-servo
Auto merge of #18363 - paulrouget:fix_style_build, r=<try>
Loading status checks…
282fe90 
use cargo manifest path to find build.py

Without this, build.py can't be found when servo is built as a dependency.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/18363)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 4, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
State: approved= try=True
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 4, 2017

I'm confused about why this is failing…
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 4, 2017

@jdm you think it was twice the same intermitent failures? Or I did something wrong?
@paulrouget paulrouget mentioned this pull request Sep 5, 2017
Closed
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 5, 2017

@bors-servo try

Travis: #18346
appveyor: Build execution time has reached the maximum allowed time for your plan (90 minutes).
@paulrouget paulrouget requested a review from SimonSapin Sep 5, 2017
@paulrouget
use cargo manifest path to find build.py script
Loading status checks…
cd13888
@paulrouget paulrouget force-pushed the paulrouget:fix_style_build branch from a18ea7f to cd13888 Sep 5, 2017
@SimonSapin
Copy link
Member

SimonSapin commented Sep 5, 2017

I don't understand and would be interested to find out why file!() doesn't do the right thing, but this looks reasonable enough.

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

📌 Commit cd13888 has been approved by SimonSapin
@highfive highfive assigned SimonSapin and unassigned glennw Sep 5, 2017
bors-servo added a commit that referenced this pull request Sep 5, 2017
@bors-servo
Auto merge of #18363 - paulrouget:fix_style_build, r=SimonSapin
Loading status checks…
16a1281 
use cargo manifest path to find build.py

Without this, build.py can't be found when servo is built as a dependency.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/18363)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

⌛ Testing commit cd13888 with merge 16a1281...
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 5, 2017

I don't understand and would be interested to find out why file!() doesn't do the right thing, but this looks reasonable enough.

The final path is wrong.

File!() returns:

.cargo\git\checkouts\servo-12bfca331f128de3\f7d238d\components\style\build.rs

and current_exe is:

C:\Users\user\servoshell\target\release\build\style-babc9b7472e289d1\build-script-build.exe

And there is not .cargo in C:\Users\user\servoshell\target\release\build\style-babc9b7472e289d1\.
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

💔 Test failed - mac-rel-wpt4
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 5, 2017

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

⚡ Previous build results for android, linux-dev, mac-dev-unit, windows-msvc-dev are reusable. Rebuilding only arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4...
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

💔 Test failed - mac-rel-wpt4
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 5, 2017

@bors-servo retry

#18374
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

⌛ Testing commit cd13888 with merge 34e0805...
bors-servo added a commit that referenced this pull request Sep 5, 2017
@bors-servo
Auto merge of #18363 - paulrouget:fix_style_build, r=SimonSapin
Loading status checks…
34e0805 
use cargo manifest path to find build.py

Without this, build.py can't be found when servo is built as a dependency.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/18363)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

💔 Test failed - linux-rel-wpt
@paulrouget
Copy link
Contributor Author

paulrouget commented Sep 5, 2017

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt2, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt, mac-rel-wpt1, mac-rel-wpt3...
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: SimonSapin
Pushing 34e0805 to master...
@bors-servo bors-servo merged commit cd13888 into servo:master Sep 5, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonSapin SimonSapin

Assignees

@SimonSapin SimonSapin

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@paulrouget @highfive @bors-servo @SimonSapin @glennw
You can’t perform that action at this time.