Skip to content
This repository has been archived by the owner on Jun 8, 2020. It is now read-only.

Upgrade core foundation #148

Merged
merged 2 commits into from Jan 27, 2018
Merged

Upgrade core foundation #148

merged 2 commits into from Jan 27, 2018

Conversation

faern
Copy link
Contributor

@faern faern commented Jan 12, 2018

This is a PR in a series of PRs originating at servo/core-foundation-rs#132

The plan is to make a breaking change to core-foundation and release it as 0.5.0. Before the merge/publish, a set of PRs making sure the entire dependency graph of Servo is ready for this change will be created.

TODO before merge of this PR:

  • Merge io-surface and servo-glutin PRs and publish.
  • Remove the last commit from this PR, so we depend on code from crates.io.

I did not read the contributing guidelines for this repo, as the link to it did not work for me.


This change is Reviewable

@@ -1,7 +1,7 @@
[package]

name = "servo-skia"
version = "0.30000009.0"
version = "0.30000010.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand exactly what versioning scheme is used here. Tell me if this was not an appropriate bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not find anything in the public API that exposed anything from the used dependencies, so I just bumped the patch version. Maybe someone with better knowledge of this crate can say if that was looks correct?

@faern faern mentioned this pull request Jan 13, 2018
15 tasks
Cargo.toml Outdated
@@ -1,7 +1,7 @@
[package]

name = "servo-skia"
version = "0.30000009.0"
version = "0.30000009.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be 0.30000010.0 because of the types from glutin and io_surface in the public API.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True. Done. Will have to upgrade the stuff depending on skia now, working on that.

@jdm
Copy link
Member

jdm commented Jan 27, 2018

This is ready once the temp commit is removed.

@faern
Copy link
Contributor Author

faern commented Jan 27, 2018

Done

@jdm
Copy link
Member

jdm commented Jan 27, 2018

@bors-servo r+

@bors-servo
Copy link

📌 Commit e177d7b has been approved by jdm

@bors-servo
Copy link

⌛ Testing commit e177d7b with merge 6f61214...

bors-servo pushed a commit that referenced this pull request Jan 27, 2018
Upgrade core foundation

This is a PR in a series of PRs originating at servo/core-foundation-rs#132

The plan is to make a breaking change to `core-foundation` and release it as `0.5.0`. Before the merge/publish, a set of PRs making sure the entire dependency graph of Servo is ready for this change will be created.

TODO before merge of this PR:
- [x] Merge `io-surface` and `servo-glutin` PRs and publish.
- [x] Remove the last commit from this PR, so we depend on code from crates.io.

I did not read the contributing guidelines for this repo, as the link to it did not work for me.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/148)
<!-- Reviewable:end -->
@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: jdm
Pushing 6f61214 to master...

@bors-servo bors-servo merged commit e177d7b into servo:master Jan 27, 2018
@bors-servo bors-servo mentioned this pull request Jan 27, 2018
bors-servo pushed a commit to servo/servo that referenced this pull request Jan 29, 2018
Upgrade core foundation

<!-- Please describe your changes on the following line: -->
This PR is the final one in a chain of PRs that tries to make a breaking change to `core-foundation`. This PR makes sure Servo only use the new, not yet released `core-foundation 0.5.0`. The changes in `core-foundation` and why it is not yet published can be read in the comments on this PR: servo/core-foundation-rs#132
Basically we want all of Servo (and deps) to be ready for a fairly swift upgrade from `core-foundation` `0.4.6` to `0.5.0` once it's released, so we don't end up in some state where we depend on, and have to maintain both, for an extended period of time.

This PR is **not ready for merge** in its current state. The following must be done first:
- [x] Merge servo/core-foundation-rs#132 and publish.
- [x] Merge servo/core-graphics-rs#110 and publish.
- [x] Merge servo/core-text-rs#75 and publish.
- [x] Merge servo/cocoa-rs#181 and publish.
- [x] Merge servo/glutin#142 and publish.
- [x] Merge servo/io-surface-rs#60 and publish.
- [x] Merge servo/skia#148.
- [x] Merge servo/rust-azure#282.
- [x] Merge servo/webrender#2299.
- [x] Merge servo/surfman#118 and publish.
- [x] Remove the commit in this PR that temporarily adds patch entries to `Cargo.toml`.
- [x] Update Cargo.lock again to not point to my feature branches.

For some of the dependencies I might accidentally have bumped the version as if it was a breaking change when it in fact wasn't. It was a bit messy to figure out all the details in so many and large crates. But hopefully I did not do the inverse, only bump the patch version where the change actually broke something.

Ping @jdm and @nox who have been the ones commenting on the initial PR.

---
<!-- 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

<!-- Either: -->
- [X] These changes do not require tests because they don't change any code, just upgrade dependencies.

<!-- 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/19759)
<!-- Reviewable:end -->
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Jan 30, 2018
…e-foundation); r=jdm

<!-- Please describe your changes on the following line: -->
This PR is the final one in a chain of PRs that tries to make a breaking change to `core-foundation`. This PR makes sure Servo only use the new, not yet released `core-foundation 0.5.0`. The changes in `core-foundation` and why it is not yet published can be read in the comments on this PR: servo/core-foundation-rs#132
Basically we want all of Servo (and deps) to be ready for a fairly swift upgrade from `core-foundation` `0.4.6` to `0.5.0` once it's released, so we don't end up in some state where we depend on, and have to maintain both, for an extended period of time.

This PR is **not ready for merge** in its current state. The following must be done first:
- [x] Merge servo/core-foundation-rs#132 and publish.
- [x] Merge servo/core-graphics-rs#110 and publish.
- [x] Merge servo/core-text-rs#75 and publish.
- [x] Merge servo/cocoa-rs#181 and publish.
- [x] Merge servo/glutin#142 and publish.
- [x] Merge servo/io-surface-rs#60 and publish.
- [x] Merge servo/skia#148.
- [x] Merge servo/rust-azure#282.
- [x] Merge servo/webrender#2299.
- [x] Merge servo/surfman#118 and publish.
- [x] Remove the commit in this PR that temporarily adds patch entries to `Cargo.toml`.
- [x] Update Cargo.lock again to not point to my feature branches.

For some of the dependencies I might accidentally have bumped the version as if it was a breaking change when it in fact wasn't. It was a bit messy to figure out all the details in so many and large crates. But hopefully I did not do the inverse, only bump the patch version where the change actually broke something.

Ping @jdm and @nox who have been the ones commenting on the initial PR.

---
<!-- 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

<!-- Either: -->
- [X] These changes do not require tests because they don't change any code, just upgrade dependencies.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e94a25949c924e086e38ef6bdbdc935734415b26

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4e0c40d1610e09d5ecf823f51d42ede8706751e3
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 2, 2019
…e-foundation); r=jdm

<!-- Please describe your changes on the following line: -->
This PR is the final one in a chain of PRs that tries to make a breaking change to `core-foundation`. This PR makes sure Servo only use the new, not yet released `core-foundation 0.5.0`. The changes in `core-foundation` and why it is not yet published can be read in the comments on this PR: servo/core-foundation-rs#132
Basically we want all of Servo (and deps) to be ready for a fairly swift upgrade from `core-foundation` `0.4.6` to `0.5.0` once it's released, so we don't end up in some state where we depend on, and have to maintain both, for an extended period of time.

This PR is **not ready for merge** in its current state. The following must be done first:
- [x] Merge servo/core-foundation-rs#132 and publish.
- [x] Merge servo/core-graphics-rs#110 and publish.
- [x] Merge servo/core-text-rs#75 and publish.
- [x] Merge servo/cocoa-rs#181 and publish.
- [x] Merge servo/glutin#142 and publish.
- [x] Merge servo/io-surface-rs#60 and publish.
- [x] Merge servo/skia#148.
- [x] Merge servo/rust-azure#282.
- [x] Merge servo/webrender#2299.
- [x] Merge servo/surfman#118 and publish.
- [x] Remove the commit in this PR that temporarily adds patch entries to `Cargo.toml`.
- [x] Update Cargo.lock again to not point to my feature branches.

For some of the dependencies I might accidentally have bumped the version as if it was a breaking change when it in fact wasn't. It was a bit messy to figure out all the details in so many and large crates. But hopefully I did not do the inverse, only bump the patch version where the change actually broke something.

Ping jdm and nox who have been the ones commenting on the initial PR.

---
<!-- 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

<!-- Either: -->
- [X] These changes do not require tests because they don't change any code, just upgrade dependencies.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e94a25949c924e086e38ef6bdbdc935734415b26

UltraBlame original commit: 931c61b9f7a889329ab73d00414483af47ac3f7e
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 2, 2019
…e-foundation); r=jdm

<!-- Please describe your changes on the following line: -->
This PR is the final one in a chain of PRs that tries to make a breaking change to `core-foundation`. This PR makes sure Servo only use the new, not yet released `core-foundation 0.5.0`. The changes in `core-foundation` and why it is not yet published can be read in the comments on this PR: servo/core-foundation-rs#132
Basically we want all of Servo (and deps) to be ready for a fairly swift upgrade from `core-foundation` `0.4.6` to `0.5.0` once it's released, so we don't end up in some state where we depend on, and have to maintain both, for an extended period of time.

This PR is **not ready for merge** in its current state. The following must be done first:
- [x] Merge servo/core-foundation-rs#132 and publish.
- [x] Merge servo/core-graphics-rs#110 and publish.
- [x] Merge servo/core-text-rs#75 and publish.
- [x] Merge servo/cocoa-rs#181 and publish.
- [x] Merge servo/glutin#142 and publish.
- [x] Merge servo/io-surface-rs#60 and publish.
- [x] Merge servo/skia#148.
- [x] Merge servo/rust-azure#282.
- [x] Merge servo/webrender#2299.
- [x] Merge servo/surfman#118 and publish.
- [x] Remove the commit in this PR that temporarily adds patch entries to `Cargo.toml`.
- [x] Update Cargo.lock again to not point to my feature branches.

For some of the dependencies I might accidentally have bumped the version as if it was a breaking change when it in fact wasn't. It was a bit messy to figure out all the details in so many and large crates. But hopefully I did not do the inverse, only bump the patch version where the change actually broke something.

Ping jdm and nox who have been the ones commenting on the initial PR.

---
<!-- 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

<!-- Either: -->
- [X] These changes do not require tests because they don't change any code, just upgrade dependencies.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e94a25949c924e086e38ef6bdbdc935734415b26

UltraBlame original commit: 931c61b9f7a889329ab73d00414483af47ac3f7e
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 2, 2019
…e-foundation); r=jdm

<!-- Please describe your changes on the following line: -->
This PR is the final one in a chain of PRs that tries to make a breaking change to `core-foundation`. This PR makes sure Servo only use the new, not yet released `core-foundation 0.5.0`. The changes in `core-foundation` and why it is not yet published can be read in the comments on this PR: servo/core-foundation-rs#132
Basically we want all of Servo (and deps) to be ready for a fairly swift upgrade from `core-foundation` `0.4.6` to `0.5.0` once it's released, so we don't end up in some state where we depend on, and have to maintain both, for an extended period of time.

This PR is **not ready for merge** in its current state. The following must be done first:
- [x] Merge servo/core-foundation-rs#132 and publish.
- [x] Merge servo/core-graphics-rs#110 and publish.
- [x] Merge servo/core-text-rs#75 and publish.
- [x] Merge servo/cocoa-rs#181 and publish.
- [x] Merge servo/glutin#142 and publish.
- [x] Merge servo/io-surface-rs#60 and publish.
- [x] Merge servo/skia#148.
- [x] Merge servo/rust-azure#282.
- [x] Merge servo/webrender#2299.
- [x] Merge servo/surfman#118 and publish.
- [x] Remove the commit in this PR that temporarily adds patch entries to `Cargo.toml`.
- [x] Update Cargo.lock again to not point to my feature branches.

For some of the dependencies I might accidentally have bumped the version as if it was a breaking change when it in fact wasn't. It was a bit messy to figure out all the details in so many and large crates. But hopefully I did not do the inverse, only bump the patch version where the change actually broke something.

Ping jdm and nox who have been the ones commenting on the initial PR.

---
<!-- 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

<!-- Either: -->
- [X] These changes do not require tests because they don't change any code, just upgrade dependencies.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e94a25949c924e086e38ef6bdbdc935734415b26

UltraBlame original commit: 931c61b9f7a889329ab73d00414483af47ac3f7e
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants