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

0.e merge #39398

Merged
merged 10 commits into from
Apr 12, 2020
Merged

0.e merge #39398

merged 10 commits into from
Apr 12, 2020

Conversation

kevingranade
Copy link
Member

Summary

SUMMARY: None

Purpose of change

Backport a selection of bugfixes to the 0.E branch for a point release.

Additional context

Probably best to rebase.

@anothersimulacrum
Copy link
Member

Could I suggest adding #39152 to this list?

@kevingranade
Copy link
Member Author

Suggestions for backports are welcome, I did a scan over the commits but I could easily miss ones that don't have commit messages that look like bugfixes.

@Qrox
Copy link
Contributor

Qrox commented Apr 9, 2020

#39238 also fixes a crash on 0.E.

@ZhilkinSerg ZhilkinSerg added Code: Build Issues regarding different builds and build environments Organization General development organization issues labels Apr 9, 2020
@ZhilkinSerg
Copy link
Contributor

@kevingranade:

I've added some parameters to job https://ci.narc.ro/job/Cataclysm-Android/, so we can manually build any branch with necessary parameters and it will do everything we do in automatic scripts (upload artifacts to Github Releases page and Playstore).

image

Do you want me to update job https://ci.narc.ro/job/Cataclysm-Matrix/ as well, so we could build updated 0.E artifacts (and other branches in the future) on-demand?

@Qrox
Copy link
Contributor

Qrox commented Apr 9, 2020

#39335 #39342 #39386 #39389 #39408 I think these can also be backported to 0.E

@anothersimulacrum
Copy link
Member

Weren't those issues caused by #38026, which was merged after 0.E?

@Qrox
Copy link
Contributor

Qrox commented Apr 9, 2020

Yep you're right, I saw the commit time was 2 months ago so I thought it was merged before 0.E while it wasn't.

@kevingranade
Copy link
Member Author

@ZhilkinSerg yes please, I'm going to want to do at least one 0.E point release, and that will be much easier than trying to use a different build system.

@Rivet-the-Zombie Rivet-the-Zombie merged commit a07ce29 into CleverRaven:0.E-branch Apr 12, 2020
@ZhilkinSerg
Copy link
Contributor

@ZhilkinSerg yes please, I'm going to want to do at least one 0.E point release, and that will be much easier than trying to use a different build system.

I've did it, so we can try building refs/heads/0.E-branch and see if it works when Jenkins is done with current builds.

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code: Build Issues regarding different builds and build environments Organization General development organization issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants