Rearrange CI jobs to spend time more efficiently

- CodeQL analysis was executed on every job that ran Clang, humping
  the total execution time by 10+ minutes alone. Now it only runs on
  a single job.
- libolm is no more compiled but installed from the repo, along with
  libssl-dev; and both are installed in the same transaction as ninja
  and valgrind, shaving out one apt transaction
- One more Windows job has been added to test building with Qt 6.3.1
  on that OS.
- Qt version is pushed earlier in the job matrix, as it becomes more
  significant than the compiler for a given platform.

1 files changed, 71 insertions, 73 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d46cfb6c..ab581238 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,43 +20,59 @@ jobs:
       max-parallel: 1
       matrix:
         os: [ ubuntu-20.04, macos-10.15 ]
-        compiler: [ Clang ] # GCC builds are added individually below
         qt-version: [ '5.15.2', '6.3.1' ]
+        compiler: [ LLVM ]
         # Not using binary values here, to make the job captions more readable
         e2ee: [ '', e2ee ]
         update-api: [ '', update-api ]
-        sonar: [ '' ]
+        static-analysis: [ '' ]
         platform: [ '' ]
         qt-arch: [ '' ]
         exclude:
         - qt-version: '6.3.1'
-          update-api: update-api
-        - os: windows-2019
-          e2ee: e2ee # Not supported by the current CI script
+          update-api: update-api # Generated code is not specific to Qt version
+        - os: ubuntu-20.04
+          e2ee: e2ee # Will be re-added with static analysis below
+        # TODO: Enable E2EE on Windows and macOS
         - os: macos-10.15
-          e2ee: e2ee # Missing OpenSSL
+          e2ee: e2ee
         include:
+        - os: windows-2019
+          qt-version: '5.15.2'
+          compiler: MSVC
+          platform: x64
+          qt-arch: win64_msvc2019_64
+        - os: ubuntu-20.04
+          qt-version: '5.15.2'
+          compiler: LLVM
+          e2ee: e2ee
+          static-analysis: codeql
         - os: ubuntu-latest
-          compiler: GCC
           qt-version: '5.15.2'
+          compiler: GCC
           e2ee: e2ee
-          sonar: sonar
+          static-analysis: sonar
         - os: ubuntu-20.04
-          compiler: GCC
           qt-version: '5.15.2'
+          compiler: GCC
           e2ee: e2ee
           update-api: update-api
+        - os: ubuntu-20.04
+          qt-version: '5.15.2'
+          compiler: LLVM
+          update-api: update-api
         - os: windows-2019
+          qt-version: '6.3.1'
           compiler: MSVC
+          # e2ee: e2ee # TODO
           platform: x64
-          qt-version: '5.15.2'
           qt-arch: win64_msvc2019_64
         - os: windows-2019
+          qt-version: '5.15.2'
           compiler: MSVC
+          update-api: update-api
           platform: x64
-          qt-version: '5.15.2'
           qt-arch: win64_msvc2019_64
-          update-api: update-api
 
     env:
       SONAR_SERVER_URL: 'https://sonarcloud.io'
@@ -66,44 +82,14 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Cache Qt
-      id: cache-qt
-      uses: actions/cache@v2
-      with:
-        path: ${{ runner.workspace }}/Qt
-        key: ${{ runner.os }}${{ matrix.platform }}-Qt${{ matrix.qt-version }}-cache
-
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v2.14.0
-      with:
-        version: ${{ matrix.qt-version }}
-        arch: ${{ matrix.qt-arch }}
-        cached: ${{ steps.cache-qt.outputs.cache-hit }}
-
-    - name: Install Ninja (macOS/Windows)
-      if: ${{ !startsWith(matrix.os, 'ubuntu') }}
-      uses: seanmiddleditch/gha-setup-ninja@v3
-
-    - name: Install Ninja and Valgrind (Linux)
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        sudo apt-get -qq install ninja-build valgrind
-        echo "VALGRIND=valgrind --tool=memcheck --leak-check=yes --gen-suppressions=all --suppressions=$GITHUB_WORKSPACE/quotest/.valgrind.supp" >>$GITHUB_ENV
-
     - name: Setup build environment
       run: |
-        if [ "${{ matrix.compiler }}" == "GCC" ]; then
-            CXX_VERSION_POSTFIX='-10'
-            echo "CC=gcc$CXX_VERSION_POSTFIX" >>$GITHUB_ENV
-            echo "CXX=g++$CXX_VERSION_POSTFIX" >>$GITHUB_ENV
-        elif [[ '${{ matrix.compiler }}' == 'Clang' ]]; then
-            if [[ '${{ runner.os }}' == 'Linux' ]]; then
-                CXX_VERSION_POSTFIX='-11'
-                # Do CodeQL analysis on one of Linux branches
-                echo "CODEQL_ANALYSIS=true" >>$GITHUB_ENV
-            fi
-            echo "CC=clang$CXX_VERSION_POSTFIX" >>$GITHUB_ENV
-            echo "CXX=clang++$CXX_VERSION_POSTFIX" >>$GITHUB_ENV
+        if [ '${{ matrix.compiler }}' == 'GCC' ]; then
+            echo "CC=gcc-10" >>$GITHUB_ENV
+            echo "CXX=g++-10" >>$GITHUB_ENV
+        elif [[ '${{ runner.os }}' != 'Windows' ]]; then
+            echo "CC=clang" >>$GITHUB_ENV
+            echo "CXX=clang++" >>$GITHUB_ENV
         fi
         if grep -q 'refs/tags' <<<'${{ github.ref }}'; then
             VERSION="$(git describe --tags)"
@@ -112,20 +98,18 @@ jobs:
         else
             VERSION="$(git describe --all --contains)-ci${{ github.run_number }}-$(git rev-parse --short HEAD)"
         fi
-        echo "QUOTEST_ORIGIN=$VERSION @ ${{ runner.os }}/${{ matrix.compiler }}" >>$GITHUB_ENV
 
-        # Build libQuotient as a shared library across platforms but also
-        # check the static configuration somewhere
+        echo "QUOTEST_ORIGIN=$VERSION @ ${{ runner.os }}/Qt-${{ matrix.qt-version }}/${{ matrix.compiler }}" >>$GITHUB_ENV
+
         CMAKE_ARGS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                     -DBUILD_SHARED_LIBS=${{ runner.os == 'Linux' }} \
                     -DCMAKE_INSTALL_PREFIX=~/.local \
                     -DCMAKE_PREFIX_PATH=~/.local \
                     -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON"
 
-        if [ -n "${{ matrix.sonar }}" ]; then
+        if [ '${{ matrix.static-analysis }}' == 'sonar' ]; then
             mkdir -p $HOME/.sonar
             CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_FLAGS=--coverage"
-            echo "COV=gcov$CXX_VERSION_POSTFIX" >>$GITHUB_ENV
         fi
         echo "CMAKE_ARGS=$CMAKE_ARGS" >>$GITHUB_ENV
 
@@ -139,14 +123,42 @@ jobs:
         cmake -E make_directory ${{ runner.workspace }}/build
         echo "BUILD_PATH=${{ runner.workspace }}/build/libQuotient" >>$GITHUB_ENV
 
-    - name: Setup MSVC environment
+    - name: Cache Qt
+      id: cache-qt
+      uses: actions/cache@v2
+      with:
+        path: ${{ runner.workspace }}/Qt
+        key: ${{ runner.os }}${{ matrix.platform }}-Qt${{ matrix.qt-version }}-cache
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2.14.0
+      with:
+        version: ${{ matrix.qt-version }}
+        arch: ${{ matrix.qt-arch }}
+        cached: ${{ steps.cache-qt.outputs.cache-hit }}
+
+    - name: Install Ninja (macOS/Windows)
+      if: ${{ !startsWith(matrix.os, 'ubuntu') }}
+      uses: seanmiddleditch/gha-setup-ninja@v3
+
+    - name: Install dependencies (Linux)
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        if [ -n "${{ matrix.e2ee }}" ]; then
+            EXTRA_DEPS="libssl-dev libolm-dev"
+            echo "QUOTEST_ORIGIN=$QUOTEST_ORIGIN with E2EE" >>$GITHUB_ENV
+        fi
+        sudo apt-get -qq install ninja-build valgrind $EXTRA_DEPS
+        echo "VALGRIND=valgrind --tool=memcheck --leak-check=yes --gen-suppressions=all --suppressions=$GITHUB_WORKSPACE/quotest/.valgrind.supp" >>$GITHUB_ENV
+
+    - name: Setup MSVC
       uses: ilammy/msvc-dev-cmd@v1
       if: matrix.compiler == 'MSVC'
       with:
         arch: ${{ matrix.platform }}
 
     - name: Download and set up Sonar Cloud tools
-      if: matrix.sonar != ''
+      if: matrix.static-analysis == 'sonar'
       env:
         SONAR_SCANNER_VERSION: 4.6.2.2472
       run: |
@@ -159,20 +171,6 @@ jobs:
         unzip -o sonar-scanner-cli*.zip
         popd
 
-    - name: Install OpenSSL
-      if: ${{ contains(matrix.os, 'ubuntu') && matrix.e2ee }}
-      run: |
-        sudo apt-get install libssl-dev
-
-    - name: Build and install olm
-      if: matrix.e2ee
-      working-directory: ${{ runner.workspace }}
-      run: |
-        git clone https://gitlab.matrix.org/matrix-org/olm.git
-        cmake -S olm -B build/olm $CMAKE_ARGS
-        cmake --build build/olm --target install
-        echo "QUOTEST_ORIGIN=$QUOTEST_ORIGIN with E2EE" >>$GITHUB_ENV
-
     - name: Build and install QtKeychain
       run: |
         cd ..
@@ -193,7 +191,7 @@ jobs:
         echo "QUOTEST_ORIGIN=$QUOTEST_ORIGIN with API files regeneration" >>$GITHUB_ENV
 
     - name: Initialize CodeQL tools
-      if: env.CODEQL_ANALYSIS
+      if: matrix.static-analysis == 'codeql'
       uses: github/codeql-action/init@v2
       with:
         languages: cpp
@@ -236,18 +234,18 @@ jobs:
       timeout-minutes: 4 # quotest is supposed to finish within 3 minutes, actually
 
     - name: Perform CodeQL analysis
-      if: env.CODEQL_ANALYSIS
+      if: matrix.static-analysis == 'codeql'
       uses: github/codeql-action/analyze@v2
 
     - name: Run sonar-scanner
-      if: matrix.sonar != ''
+      if: matrix.static-analysis == 'sonar'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         mkdir .coverage && pushd .coverage
         find $BUILD_PATH -name '*.gcda' -print0 \
-            | xargs -0 $COV -s $GITHUB_WORKSPACE -pr
+            | xargs -0 gcov -s $GITHUB_WORKSPACE -pr
         # Coverage of the test source code is not tracked, as it is always 100%
         # (if not, some tests failed and broke the build at an earlier stage)
         rm -f quotest* autotests*