Add 1.4-rc1 to beta - Githubissues

flathub / net.supertuxkart.SuperTuxKart

https://flathub.org/apps/details/net.supertuxkart.SuperTuxKart

6 stars 8 forks source link

Add 1.4-rc1 to beta #26

Closed jibsaramnim closed 1 year ago

jibsaramnim commented 1 year ago

Resolves #25

I tried to follow whatever was already in this repository, but please let me know if I missed anything :).

flathubbot commented 1 year ago

Started test build 4218

flathubbot commented 1 year ago

Build 4218 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/116657/net.supertuxkart.SuperTuxKart.flatpakref

jibsaramnim commented 1 year ago

Works as expected on two of my systems using the above test build install :)

AsciiWolf commented 1 year ago

Thanks for the PR! Could you please remove the runtime-version and config-opts changes and merge the actual changes from master using git merge origin/master (or git rebase origin/master)? Thanks!

flathubbot commented 1 year ago

Started test build 4370

flathubbot commented 1 year ago

Build 4370 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/116811/net.supertuxkart.SuperTuxKart.flatpakref

flathubbot commented 1 year ago

Started test build 4372

AsciiWolf commented 1 year ago

Thanks! Any chance you could remove the "Revert runtime-version and config-opts changes." commit? It does not seem correct.

jibsaramnim commented 1 year ago

Hi @AsciiWolf! Thank you for taking a look, and apologies for not having merged master into this myself. I had based my changes off of the beta branch and as they looked so different I wasn't sure if I should've done that.

I have rebased off of master, though as you already noticed, my initial runtime and config-opts revert really wasn't necessary, so I've reverted that commit as you suggested too. I must admit that Git's rebase logic always confuses me, so please let me know if I have made any mistakes there, and/or if I missed anything else. There seem to be some merge conflicts now, I am not sure if that's my doing or just because the beta branch was so different from master already?

I have removed the screenshots patch as this no longer seems needed with more recent versions of STK.

Many thanks!

flathubbot commented 1 year ago

Build 4372 failed

flathubbot commented 1 year ago

Started test build 4377

flathubbot commented 1 year ago

Build 4377 failed

flathubbot commented 1 year ago

Started test build 4389

jibsaramnim commented 1 year ago

I've also removed cacert patch as that no longer seems necessary either (Based on https://github.com/supertuxkart/stk-code/commit/9bf537ab351f165555048fbc5df88193d8cd70f2, and the build bot noticing it appearing like a reverse patch instead).

flathubbot commented 1 year ago

Build 4389 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/116832/net.supertuxkart.SuperTuxKart.flatpakref

jibsaramnim commented 1 year ago

Confirmed that the above test build installs successfully on my main machine!

AsciiWolf commented 1 year ago

Thanks! The final 1.4 STK was however released today. I will update the master branch and sync the beta branch with it so there won't be any merge conflicts with beta in the future. Thanks again for your PR. I am going to close it now, but feel free to send new PRs, they are highly appreciated (since I am usually the only active contributor)!