Merge branch '1.10'

Author: lnjX

.github/workflows/tests.yml

@@ -9,27 +9,25 @@ on: [push, pull_request]
 jobs:
   linux:
     runs-on: ubuntu-latest
-    container:
-      image: debian:stable
     env:
       CONFIG: ${{ matrix.config }}
       QT_VERSION: ${{ matrix.qt_version }}
     strategy:
       fail-fast: false
       matrix:
         config: [minimal, full, full-debug]
-        qt_version: ['5.15.*']
+        qt_version: ['6.9.0']
         include:
           - config: minimal
-            qt_version: 6.1.*
+            qt_version: 5.15.*
+          - config: full-debug
+            qt_version: 5.15.*
           - config: full-debug
-            qt_version: 6.5.3
+            qt_version: 6.1.3
     steps:
-      - name: Install sudo
-        run: apt update && apt install -qq -y sudo
       - uses: actions/checkout@v2
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt_version }}
           modules: ${{ (startsWith(matrix.qt_version, '6.') && 'qt5compat') || '' }}
@@ -51,14 +49,14 @@ jobs:
       fail-fast: false
       matrix:
         config: [minimal, full, full-debug]
-        qt_version: ['5.15.*']
+        qt_version: ['6.8.*']
         include:
           - config: full-debug
-            qt_version: 6.7.*
+            qt_version: 5.15.*
     steps:
       - uses: actions/checkout@v2
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt_version }}
           modules: ${{ matrix.qt_version[0] == '6' && 'qt5compat' || '' }}
@@ -81,11 +79,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        qt_version: ['5.15.*', '6.7.*']
+        qt_version: ['5.15.*', '6.8.*']
     steps:
       - uses: actions/checkout@v3
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt_version }}
           modules: ${{ (startsWith(matrix.qt_version, '6.') && 'qt5compat') || '' }}