search

mint-n-pepper / DanceBotsEditor

Qt GUI to edit Dancebot Choreographies
https://www.dancebots.ch
GNU General Public License v3.0
4 stars 1 forks source link

Merge Develop -> Master for 1.2.0 release #95

Closed philippReist closed 2 years ago

r-oung commented 2 years ago

@philippReist I've changed the actions to build only with Qt 5.12 LTS and I removed Qt 5.15 LTS. I decided to only use the most recent 5.12 LTS version (which is 5.12.11), see here. It should be compatible with 5.12.6 and 5.12.9, since it's only a patch version number update.

It looks like it's building without any issues on Windows, Ubuntu, and macOS. However, I'm not sure why it's still expecting to build with Qt 5.12.6 and 5.12.9. Did you add any branch protection rules in Settings? Maybe it's a GitHub bug -- you can try closing this PR and re-opening it.. weird.

philippReist commented 2 years ago

Thank you Ray!

Yeah it was the branch protection rules. I updated them to the 5.12.11 builds.

I don't understand why the PR says it has conflicts there should not be any. Will try and recreate.