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

Move config info from build_gecko.rs to Gecko code #16941

Merged
merged 2 commits into from May 19, 2017
Merged

Move config info from build_gecko.rs to Gecko code #16941

merged 2 commits into from May 19, 2017

Conversation

@upsuper
Copy link
Member

upsuper commented May 18, 2017 •
edited by larsbergstrom

This is the Servo side change for bug 1336540

This change is Reviewable
@highfive
Copy link

highfive commented May 18, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml, components/style/build.rs, components/style/build_gecko.rs
  • @wafflespeanut: python/servo/build_commands.py
  • @emilio: components/style/Cargo.toml, components/style/build.rs, components/style/build_gecko.rs
@highfive
Copy link

highfive commented May 18, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style code, but no tests are modified. Please consider adding a test!
@upsuper
Copy link
Member Author

upsuper commented May 18, 2017

@bors-servo r=emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 18, 2017

📌 Commit 22e26f9 has been approved by emilio
@highfive highfive assigned emilio and unassigned nox May 18, 2017
@upsuper
Copy link
Member Author

upsuper commented May 18, 2017

@bors-servo p=10
@upsuper
Copy link
Member Author

upsuper commented May 18, 2017

@bors-servo r-

Oh, wait, I forgot to address review comment...
@upsuper upsuper force-pushed the upsuper-forks:bug1336540 branch from 22e26f9 to 0248a4f May 18, 2017
@upsuper
Copy link
Member Author

upsuper commented May 18, 2017

@bors-servo r=emilio p=10
@bors-servo
Copy link
Contributor

bors-servo commented May 18, 2017

📌 Commit 0248a4f has been approved by emilio
@upsuper
Copy link
Member Author

upsuper commented May 18, 2017

@bors-servo r-

This will conflict with #16067.
@bors-servo
Copy link
Contributor

bors-servo commented May 18, 2017

☔ The latest upstream changes (presumably #16067) made this pull request unmergeable. Please resolve the merge conflicts.
@upsuper upsuper force-pushed the upsuper-forks:bug1336540 branch from a740102 to bd10752 May 19, 2017
@upsuper
Copy link
Member Author

upsuper commented May 19, 2017

Apparently I don't understand git and how git rebase -i works...
@upsuper upsuper force-pushed the upsuper-forks:bug1336540 branch from bd10752 to 29841e6 May 19, 2017
@upsuper
Copy link
Member Author

upsuper commented May 19, 2017

@bors-servo r=emilio p=10
@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

📌 Commit 29841e6 has been approved by emilio
upsuper added 2 commits May 19, 2017
@upsuper
Move config info from build_gecko.rs to a toml file in gecko.
f123b26
@upsuper
Remove --with-gecko from build-geckolib because it is not usable.
Loading status checks…
dafc6ad
@upsuper upsuper force-pushed the upsuper-forks:bug1336540 branch from 29841e6 to dafc6ad May 19, 2017
@upsuper
Copy link
Member Author

upsuper commented May 19, 2017

@bors-servo r=emilio p=10
@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

📌 Commit dafc6ad has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

⌛ Testing commit dafc6ad with merge 0ad0641...
bors-servo added a commit that referenced this pull request May 19, 2017
@bors-servo
Auto merge of #16941 - upsuper:bug1336540, r=emilio
Loading status checks…
0ad0641 
Move config info from build_gecko.rs to Gecko code

This is the Servo side change for [bug 1336540](https://bugzilla.mozilla.org/show_bug.cgi?id=1336540)

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

bors-servo commented May 19, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: emilio
Pushing 0ad0641 to master...
@bors-servo bors-servo merged commit dafc6ad into servo:master May 19, 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
@bors-servo bors-servo mentioned this pull request May 19, 2017
Merged
3 of 5 tasks complete
@upsuper upsuper deleted the upsuper-forks:bug1336540 branch May 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@upsuper @highfive @bors-servo @nox @emilio
You can’t perform that action at this time.