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

Avoid recompiling script every time surfman changes #24752

Merged

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Nov 15, 2019

Uses a version of webxr where webxr-api doesn't depend on surfman, so we can make changes to it without rebuilding script.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because it's just build issues
@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 15, 2019

Can land once servo/webxr#91 does.

@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 15, 2019

r? @jdm

@highfive highfive assigned jdm and unassigned nox Nov 15, 2019
@jdm
jdm approved these changes Nov 15, 2019
@asajeffrey asajeffrey force-pushed the asajeffrey:split-surfman-chains-api-and-impl branch from bc00b6f to dfed5ef Nov 15, 2019
@asajeffrey asajeffrey marked this pull request as ready for review Nov 15, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 15, 2019

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2019

📌 Commit dfed5ef has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2019

The latest upstream changes (presumably #24746) made this pull request unmergeable. Please resolve the merge conflicts.

@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2019

🔒 Merge conflict

@asajeffrey asajeffrey force-pushed the asajeffrey:split-surfman-chains-api-and-impl branch from dfed5ef to 124de75 Nov 18, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 18, 2019

Rebased. @bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 18, 2019

📌 Commit 124de75 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

Testing commit 124de75 with merge 7650849...

bors-servo added a commit that referenced this pull request Nov 19, 2019
…r=jdm

Avoid recompiling script every time surfman changes

<!-- Please describe your changes on the following line: -->

Uses a version of webxr where webxr-api doesn't depend on surfman, so we can make changes to it without rebuilding script.

---
<!-- 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
- [x] These changes do not require tests because it's just build issues

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Nov 19, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

Testing commit 124de75 with merge 64247e3...

bors-servo added a commit that referenced this pull request Nov 19, 2019
…r=jdm

Avoid recompiling script every time surfman changes

<!-- Please describe your changes on the following line: -->

Uses a version of webxr where webxr-api doesn't depend on surfman, so we can make changes to it without rebuilding script.

---
<!-- 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
- [x] These changes do not require tests because it's just build issues

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Nov 19, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

Testing commit 124de75 with merge e6ae93f...

bors-servo added a commit that referenced this pull request Nov 19, 2019
…r=jdm

Avoid recompiling script every time surfman changes

<!-- Please describe your changes on the following line: -->

Uses a version of webxr where webxr-api doesn't depend on surfman, so we can make changes to it without rebuilding script.

---
<!-- 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
- [x] These changes do not require tests because it's just build issues

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing e6ae93f to master...

@bors-servo bors-servo merged commit 124de75 into servo:master Nov 19, 2019
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Nov 19, 2019
4 of 4 tasks complete
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.

None yet

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