Remove Qt5 jobs from CI

quotient-im · Oct 19, 2023 · 5a8c2f7 · 5a8c2f7
1 parent d3ea5eb
commit 5a8c2f7
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,16 +19,12 @@ jobs:
       max-parallel: 1
       matrix:
         os: [ ubuntu-22.04, macos-11, windows-2019 ]
-        qt-version: [ '6.4', '5.15' ]
+        qt-version: [ '6.4' ]
         override-compiler: [ '', GCC ] # Defaults: MSVC on Windows, Clang elsewhere
         # Not using binary values here, to make the job captions more readable
         e2ee: [ e2ee, '' ]
         update-api: [ '' ]
         exclude: # Drop less important combinations to lower the jobs number
-        - qt-version: '5.15'
-          e2ee: ''
-        - qt-version: '5.15'
-          override-compiler: GCC
         - os: macos-11
           override-compiler: GCC
         - os: windows-2019
@@ -39,15 +35,8 @@ jobs:
           e2ee: e2ee
           override-compiler: GCC
           static-analysis: sonar
-        - os: ubuntu-22.04 # Overrides the existing job
-          qt-version: '5.15'
-          e2ee: e2ee
-          update-api: update-api
-          static-analysis: codeql
-          # NB ^: Valgrind is enabled with GCC but doesn't like CodeQL
-          #       instrumentation; so don't use CodeQL with GCC for now
         - os: ubuntu-22.04
-          qt-version: '5.15'
+          qt-version: '6.4'
           override-compiler: GCC
           update-api: update-api
 
@@ -79,11 +68,6 @@ jobs:
         if [ '${{ matrix.override-compiler }}' == 'GCC' ]; then
             echo "CC=gcc" >>$GITHUB_ENV
             echo "CXX=g++" >>$GITHUB_ENV
-            if [ '${{ startsWith(matrix.qt-version, '5') }}' == 'true' ]; then
-                # Patch Qt to avoid GCC tumbling over QTBUG-90568/QTBUG-91909
-                sed -i 's/ThreadEngineStarter<void>(ThreadEngine<void> \*_threadEngine)/ThreadEngineStarter(ThreadEngine<void> \*_threadEngine)/' \
-                    $Qt5_DIR/include/QtConcurrent/qtconcurrentthreadengine.h
-            fi
             echo "VALGRIND=valgrind --tool=memcheck --leak-check=yes --gen-suppressions=all --suppressions=$GITHUB_WORKSPACE/quotest/.valgrind.supp" >>$GITHUB_ENV
         elif [[ '${{ runner.os }}' != 'Windows' ]]; then
             echo "CC=clang" >>$GITHUB_ENV