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.

Sign up for GitHub

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

Jump to bottom

Update to master gfx-rs #198

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Update to master gfx-rs #198

merged 1 commit into from
Sep 6, 2019

Conversation

kvark
Copy link
Member

@kvark kvark commented Sep 1, 2019

Fixes #194
Relying on failure is a real pain :/

@kvark
Copy link
Member Author

kvark commented Sep 1, 2019

@omni-viral any tips/preference on how to get this finished?

@kvark kvark changed the title WIP update to master gfx-rs Update to master gfx-rs Sep 2, 2019
@kvark kvark marked this pull request as ready for review September 2, 2019 05:02
@zakarumych
Copy link
Member

Looks nice. Let's make CI happy :)

@kvark kvark force-pushed the gfx-update branch 2 times, most recently from 7d2aad2 to 1407f6a Compare September 3, 2019 22:19
@kvark
Copy link
Member Author

kvark commented Sep 3, 2019

@omni-viral how about now?

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

Ok, now it should properly build on CI.
@omni-viral I'm not super happy about the part Some(graph). Had to do it because EventLoop::run() is not returning any more and it's closure takes ownership of things. This could probably be written much nicer, e.g. by not moving things into that closure.

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

Another annoying thing is that the meshes example panics on exit (in Factory::drop). I see that the original code force the drop order of Families versus Factory, but trying to do the same with the new code doesn't seem to help.

@kvark
Update to gfx-rs rev a084a1f2fec6c9ed928c53e2dc8c1761782b9019
e74c23e 
The change mostly removes the use of "failure" from the crate as gfx-rs
does no longer implement it.
We also switch winit dependency to 0.20.0-alpha3.
@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

I certainly didn't intend to invest into the whole winit update thing :/
@omni-viral please have a look

zakarumych
zakarumych approved these changes Sep 5, 2019
View reviewed changes
Copy link
Member

@zakarumych zakarumych left a comment

Choose a reason for hiding this comment

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

Thanks for the update!

bors r+

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
75115c3 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
90ac924 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

timeouts :/
bors retry

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
17186a1 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

@omni-viral can we has higher CI timeouts?..

@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
ca2c284 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

I wish we could say something like "bors retry timeout=50", supposing that "timeout" is just a user-defined variable in bors with some default value, which it can propagate (somehow) to the actual CI services.
cc @notriddle

@notriddle
Copy link

  1. You can prevent Travis from timing out by using travis_wait

  2. You can prevent bors from timing out by using timeout-sec

@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
b3eac7e 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@zakarumych
Copy link
Member

zakarumych commented Sep 5, 2019 •
edited
Loading

@kvark IIRC we already set timeout to 30 min.

Edit. Only for mac and ios...
I guess we should do the same for all platforms

@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Build failed

@Frizi
Copy link
Member

Frizi commented Sep 5, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
eb59875 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 5, 2019 via email

bors bot added a commit that referenced this pull request Sep 5, 2019
@bors @kvark
Merge #198
648c102 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@notriddle
Copy link

Hey, @kvark

Did you notice that Travis CI's status page reports degraded service? You might want to wait until they fix that.

@bors
Copy link
Contributor

bors bot commented Sep 5, 2019

Timed out

@kvark
Copy link
Member Author

kvark commented Sep 6, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 6, 2019
@bors @kvark
Merge #198
275883c 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Sep 6, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 6, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 6, 2019
@bors @kvark
Merge #198
a6b9b5f 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Sep 6, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 6, 2019

It doesn't look like the status means much for this case. What matters more is the backlog size, and the fact current timeouts are abysmally small.

@kvark
Copy link
Member Author

kvark commented Sep 6, 2019

bors retry

bors bot added a commit that referenced this pull request Sep 6, 2019
@bors @kvark
Merge #198
8cf05a1 
198: Update to master gfx-rs r=omni-viral a=kvark

Fixes  #194
Relying on `failure` is a real pain :/

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Sep 6, 2019

Build failed

@kvark
Copy link
Member Author

kvark commented Sep 6, 2019

bors retry

@zakarumych
Copy link
Member

@kvark maybe we can just merge it? :)

@kvark
Copy link
Member Author

kvark commented Sep 6, 2019 via email

@zakarumych zakarumych merged commit a8ac0de into amethyst:master Sep 6, 2019
@kvark kvark deleted the gfx-update branch September 6, 2019 14:03
@kvark kvark mentioned this pull request Sep 10, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zakarumych zakarumych zakarumych approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Rendy to use gfx-rs from git
4 participants
@kvark @zakarumych @notriddle @Frizi