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

Bump to 0.28 #841

Merged
merged 1 commit into from
Jul 24, 2017
Merged

Bump to 0.28 #841

merged 1 commit into from
Jul 24, 2017

Conversation

Manishearth
Copy link
Member

Brings in #822 which unblocks https://bugzilla.mozilla.org/show_bug.cgi?id=1366956,
and also #829 which should greatly reduce merge conflicts in checked in bindings.

@fitzgen
Copy link
Member

fitzgen commented Jul 21, 2017

@Manishearth you need to update the lock file:

diff --git a/Cargo.lock b/Cargo.lock
index 1615200..6ea1045 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "bindgen"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cexpr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

@fitzgen
Copy link
Member

fitzgen commented Jul 21, 2017

r=me with that

@Manishearth Manishearth force-pushed the bump branch 2 times, most recently from 8045932 to eb46d65 Compare July 22, 2017 00:19
@upsuper
Copy link
Contributor

upsuper commented Jul 23, 2017

Let's don't push on this. It seems the bindgen still doesn't work for stylo.

@Manishearth
Copy link
Member Author

I'm aware, been investigating that.

See #842 (comment)

@upsuper
Copy link
Contributor

upsuper commented Jul 23, 2017

I think I'm hitting a different one likely regressed from #829.

@bors-servo
Copy link

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

@Manishearth Manishearth changed the title Bump to 0.27.1 Bump to 0.28 Jul 24, 2017
@Manishearth
Copy link
Member Author

@bors-servo r=fitzgen

@bors-servo
Copy link

📌 Commit d4da81a has been approved by fitzgen

@bors-servo
Copy link

⌛ Testing commit d4da81a with merge 23dbe48...

bors-servo pushed a commit that referenced this pull request Jul 24, 2017
Bump to 0.28

Brings in  #822 which unblocks https://bugzilla.mozilla.org/show_bug.cgi?id=1366956,
and also #829 which should greatly reduce merge conflicts in checked in bindings.
@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: fitzgen
Pushing 23dbe48 to master...

@bors-servo bors-servo merged commit d4da81a into master Jul 24, 2017
@Manishearth Manishearth deleted the bump branch July 24, 2017 21:33
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.

5 participants