Skip to content

[Merged by Bors] - Fix CI for android#2971

Closed
Davier wants to merge 1 commit intobevyengine:pipelined-renderingfrom
Davier:fix_android_ci
Closed

[Merged by Bors] - Fix CI for android#2971
Davier wants to merge 1 commit intobevyengine:pipelined-renderingfrom
Davier:fix_android_ci

Conversation

@Davier
Copy link
Contributor

@Davier Davier commented Oct 15, 2021

Objective

The update to wgpu 0.11 broke CI for android. This was due to a confusion between bevy::render::ShaderStage and wgpu::ShaderStage.

Solution

Revert the incorrect change

@alice-i-cecile alice-i-cecile added A-Build-System Related to build systems or continuous integration A-Rendering Drawing game state to the screen O-Android Specific to the Android mobile operating system P-High This is particularly urgent, and deserves immediate attention S-Needs-Review labels Oct 15, 2021
@alice-i-cecile
Copy link
Member

LGTM. I'm not seeing the CI break on other PRs though; am I missing something?

@IceSentry
Copy link
Contributor

IceSentry commented Oct 15, 2021

#2653 failed because of this. I assume it's only PR to the pipeline-rendering branch that fail.

@alice-i-cecile alice-i-cecile added S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it and removed S-Needs-Review labels Oct 15, 2021
@mockersf
Copy link
Member

bors r+

bors bot pushed a commit that referenced this pull request Oct 15, 2021
# Objective

The update to wgpu 0.11 broke CI for android. This was due to a confusion between `bevy::render::ShaderStage` and `wgpu::ShaderStage`.


## Solution

Revert the incorrect change
@bors
Copy link
Contributor

bors bot commented Oct 15, 2021

@bors bors bot changed the title Fix CI for android [Merged by Bors] - Fix CI for android Oct 15, 2021
@bors bors bot closed this Oct 15, 2021
@Davier Davier deleted the fix_android_ci branch October 19, 2021 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Build-System Related to build systems or continuous integration A-Rendering Drawing game state to the screen O-Android Specific to the Android mobile operating system P-High This is particularly urgent, and deserves immediate attention S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants