Skip to content

Update heartbeats-simple to 0.3.0#11785

Merged
bors-servo merged 1 commit intoservo:masterfrom
connorimes:update-hbs-0.3.0
Jun 20, 2016
Merged

Update heartbeats-simple to 0.3.0#11785
bors-servo merged 1 commit intoservo:masterfrom
connorimes:update-hbs-0.3.0

Conversation

@connorimes
Copy link
Copy Markdown
Contributor

@connorimes connorimes commented Jun 18, 2016

Updated heartbeats-simple dependency for native changes:
-Collapse libraries into one.
-Remove overriding of some default CMake behavior.
-Windows compatibility with compiler flags, locking, and sleeping in example (thanks Jack Moffitt and Vladimir Vukicevic).


  • ./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 it's just a dependency update

This change is Reviewable

@highfive
Copy link
Copy Markdown

Heads up! This PR modifies the following files:

  • @fitzgen: components/profile/heartbeats.rs, components/profile/lib.rs, components/profile/Cargo.toml

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 18, 2016
@metajack
Copy link
Copy Markdown
Collaborator

r=me but I'm pretty sure this needs more Cargo.lock changes.


Reviewed 4 of 4 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@metajack
Copy link
Copy Markdown
Collaborator

As in, I would expect ports/cef/Cargo.lock to need updating as well at a minimum.


Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.


Comments from Reviewable

@connorimes
Copy link
Copy Markdown
Contributor Author

You are correct, thank you.

@jdm
Copy link
Copy Markdown
Member

jdm commented Jun 20, 2016

@bors-servo: r=metajack

@highfive highfive assigned metajack and unassigned pcwalton Jun 20, 2016
@bors-servo
Copy link
Copy Markdown
Contributor

📌 Commit 101aa0d has been approved by metajack

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jun 20, 2016
@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit 101aa0d with merge 6289bf8...

bors-servo pushed a commit that referenced this pull request Jun 20, 2016
Update heartbeats-simple to 0.3.0

Updated heartbeats-simple dependency for native changes:
-Collapse libraries into one.
-Remove overriding of some default CMake behavior.
-Windows compatibility with compiler flags, locking, and sleeping in example (thanks Jack Moffitt and Vladimir Vukicevic).

---
<!-- 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
- [X] These changes do not require tests because it's just a dependency update

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

💔 Test failed - linux-rel

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 20, 2016
@jdm
Copy link
Copy Markdown
Member

jdm commented Jun 20, 2016

@bors-servo
Copy link
Copy Markdown
Contributor

⌛ Testing commit 101aa0d with merge 09a39af...

bors-servo pushed a commit that referenced this pull request Jun 20, 2016
Update heartbeats-simple to 0.3.0

Updated heartbeats-simple dependency for native changes:
-Collapse libraries into one.
-Remove overriding of some default CMake behavior.
-Windows compatibility with compiler flags, locking, and sleeping in example (thanks Jack Moffitt and Vladimir Vukicevic).

---
<!-- 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
- [X] These changes do not require tests because it's just a dependency update

<!-- 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/11785)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jun 20, 2016
@bors-servo
Copy link
Copy Markdown
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

@bors-servo bors-servo merged commit 101aa0d into servo:master Jun 20, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jun 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants