aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorstonedDiscord <Tukz@gmx.de>2022-12-28 21:35:11 +0100
committerGitHub <noreply@github.com>2022-12-28 21:35:11 +0100
commita449aa86e9f1758b5661fba640a626bc12080988 (patch)
tree8aa2a5a6272a2b8c93a22e3b019d6773f97db585 /.github
parent1aca9a19dbc9f2c83de39f71fc2ff284ca33984d (diff)
Qt6 (#824)
* Major cleanup of screenshake code * Add pre-5.10 support for screenshake math * more compat, uglier too * add surprise tool * we don't need inline functions * only run qsrand on old versions * Squash compiler warnings * >= not > please * don't set codec in qt6 * switch to new regex * remove qdesktopwidget (was unused) * make enter event an enter event * forgot header file * rename emote_mod enum as there is an enum of the same name in chat_message * regexp * no more codec * fix warning about emote_mod type * change to new qtconcurrent * misc was unused * fix run * change qtconcurrent for music * codecs came back * make CI run on qt6 too * seperate artifacts * qFormatLogMessage is wonky here * maybe actually use the qt version from matrix * change qt version here as well * even lower * use my own fixed installer * use my own fixed version of qapng * get websockets * minor spelling mistake * yOu nEeD aDdOnS * aaaaaaaaaaaaaaaaaaaaaaaaaaaaa * Revert "maybe actually use the qt version from matrix" This reverts commit 7ab6b1b4c2f1200318d52f325efd2ef46c3fbd6a. * Revert "Revert "maybe actually use the qt version from matrix"" This reverts commit a6f7c5bedf214a1992c15b296edd195f96a9196a. * use jurplels again * Revert "use jurplels again" This reverts commit 5795474bca64590f1479af3ccbf7d8cc57f427e7. * revert CI to master * main not master Co-authored-by: in1tiate <woodward.randall02+github@gmail.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 518cd977..019c8ded 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
- name: Add msbuild to PATH
if: matrix.platform == 'msvc2019'
- uses: microsoft/setup-msbuild@master
+ uses: microsoft/setup-msbuild@main
- name: Downgrade Android NDK
if: matrix.platform == 'android'
@@ -64,7 +64,7 @@ jobs:
- uses: Skycoder42/action-setup-qt@master
id: qt
with:
- version: 5.15.1
+ version: ${{matrix.version}}
platform: ${{matrix.platform}}
- name: Install QtApng