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

Update HACKING_QUICKSTART.md #12266

Merged
merged 1 commit into from Jul 8, 2016
Merged

Update HACKING_QUICKSTART.md #12266

merged 1 commit into from Jul 8, 2016

Conversation

@tshepang
Copy link
Contributor

tshepang commented Jul 5, 2016

Some grammar fixes


  • ./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 they are documentation changes

This change is Reviewable

@highfive
Copy link

highfive commented Jul 5, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @nox (or someone else) soon.

@nox
Copy link
Member

nox commented Jul 5, 2016

-S-awaiting-review +S-awaiting-answer


Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, 3 unresolved discussions.


docs/HACKING_QUICKSTART.md, line 12 [r1] (raw file):

## Building Servo

Building Servo is quite easy. Install the pre-requisites described in the [README](../README.md) file, then type:

"Prerequisites" exists and seems to be more widely-used, no?


docs/HACKING_QUICKSTART.md, line 48 [r1] (raw file):

The -- separates mach options from servo options. This is not required, but we recommend it. mach and servo have some options with the same name (--help, --debug), so the -- makes it clear where options apply.

Why?


docs/HACKING_QUICKSTART.md, line 244 [r1] (raw file):

### Updating a test:

In some cases, extensive tests for the feature you're working on already exist under tests/wpt:

Why remove "may"?


Comments from Reviewable

@tshepang
Copy link
Contributor Author

tshepang commented Jul 5, 2016

Review status: all files reviewed at latest revision, 3 unresolved discussions.


docs/HACKING_QUICKSTART.md, line 12 [r1] (raw file):

Previously, nox (Anthony Ramine) wrote…

"Prerequisites" exists and seems to be more widely-used, no?

agreed... I thought it was the other way around

docs/HACKING_QUICKSTART.md, line 48 [r1] (raw file):

Previously, nox (Anthony Ramine) wrote…

Why?

One should not continue the sentence like that, so adding _so_ makes it flow better.

docs/HACKING_QUICKSTART.md, line 244 [r1] (raw file):

Previously, nox (Anthony Ramine) wrote…

Why remove "may"?

You either want to remove _may_ or _In some cases__. That is, in this case, *In some cases_ implies _sometimes_, same as _may_.

Comments from Reviewable

@nox
Copy link
Member

nox commented Jul 5, 2016

Thanks for your contribution!

-S-awaiting-answer +S-needs-code-changes


Review status: all files reviewed at latest revision, 1 unresolved discussion.


docs/HACKING_QUICKSTART.md, line 12 [r1] (raw file):

Previously, tshepang (Tshepang Lekhonkhobe) wrote…

agreed... I thought it was the other way around

r=me once this is reverted. :)

Comments from Reviewable

@tshepang
Copy link
Contributor Author

tshepang commented Jul 6, 2016

r=@nox

@KiChjang
Copy link
Member

KiChjang commented Jul 6, 2016

Unfortunately, bors-servo only listens to reviewers.

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2016

📌 Commit 7573487 has been approved by nox

@KiChjang
Copy link
Member

KiChjang commented Jul 6, 2016

@bors-servo r-

@tshepang Sorry, can I get you to squash your two commits into one before I accept this PR?

@tshepang
Copy link
Contributor Author

tshepang commented Jul 6, 2016

Does the UI not allow you to do it? Let me do it from my CLI.

@tshepang tshepang force-pushed the tshepang:patch-1 branch from 7573487 to 9283770 Jul 6, 2016
@jdm
Copy link
Member

jdm commented Jul 7, 2016

@bors-servo: r=nox
The github UI does, but our merge bot does not.

@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

📌 Commit 9283770 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

Testing commit 9283770 with merge 1d8b04f...

bors-servo added a commit that referenced this pull request Jul 7, 2016
Update HACKING_QUICKSTART.md

Some grammar fixes

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

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

<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12266)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

💔 Test failed - linux-rel

@wafflespeanut
Copy link
Member

wafflespeanut commented Jul 7, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

Testing commit 9283770 with merge 220b0ef...

bors-servo added a commit that referenced this pull request Jul 7, 2016
Update HACKING_QUICKSTART.md

Some grammar fixes

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

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

<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12266)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

💔 Test failed - mac-rel-wpt

@wafflespeanut
Copy link
Member

wafflespeanut commented Jul 7, 2016

This is happening again!

Traceback (most recent call last):
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/executors/base.py", line 149, in run_test
    result = self.do_test(test)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/executors/executorservo.py", line 133, in do_test
    self.proc.kill()
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/python/_virtualenv/lib/python2.7/site-packages/mozprocess/processhandler.py", line 749, in kill
    self.proc.kill(sig=sig)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/python/_virtualenv/lib/python2.7/site-packages/mozprocess/processhandler.py", line 165, in kill
    send_sig(signal.SIGTERM)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/python/_virtualenv/lib/python2.7/site-packages/mozprocess/processhandler.py", line 152, in send_sig
    os.killpg(pid, sig)
OSError: [Errno 1] Operation not permitted
@KiChjang
Copy link
Member

KiChjang commented Jul 7, 2016

@bors-servo retry

  • #InfraOnFire
@KiChjang
Copy link
Member

KiChjang commented Jul 7, 2016

@bors-servo rollup

@tshepang
Copy link
Contributor Author

tshepang commented Jul 7, 2016

@jdm you could squash via Github UI then ask the bot to merge?

@wafflespeanut
Copy link
Member

wafflespeanut commented Jul 7, 2016

We never use the Github UI to merge commits. We've been relying on bors's auto-merging mechanism for a long time. Also, testing helps us to keep track of the intermittents that pop up every now and then.

@tshepang
Copy link
Contributor Author

tshepang commented Jul 7, 2016

@wafflespeanut understood, but that's not what I said

@KiChjang
Copy link
Member

KiChjang commented Jul 7, 2016

@tshepang I only see the "Squash and Merge" option. I don't think GitHub UI provides a way for us to only perform a squash.

@tshepang
Copy link
Contributor Author

tshepang commented Jul 7, 2016

oh, alright

@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2016

Testing commit 9283770 with merge 9b2b101...

bors-servo added a commit that referenced this pull request Jul 8, 2016
Update HACKING_QUICKSTART.md

Some grammar fixes

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

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

<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12266)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2016

@bors-servo bors-servo merged commit 9283770 into servo:master Jul 8, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@tshepang tshepang deleted the tshepang:patch-1 branch Jul 8, 2016
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

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