From 28744810c40692df6f504e5c57785af4c8a03292 Mon Sep 17 00:00:00 2001
From: Kasia <zneix@zneix.eu>
Date: Tue, 14 Jun 2022 14:48:21 +0200
Subject: [PATCH] Bump Qt 5.12.10 to 5.12.12 (#3809)

Normalize cache method between build and test workflow
Normalize Qt install method between build and test workflow
Add explicit Qt version in test workflow
Allow builds to be triggered through workflow dispatch https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
---
 .github/workflows/build.yml |  7 ++-----
 .github/workflows/test.yml  | 14 ++++++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b67a979..f7c45ca2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 concurrency: 
   group: build-${{ github.ref }}
@@ -17,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        qt-version: [5.15.2, 5.12.10]
+        qt-version: [5.15.2, 5.12.12]
         build-system: [qmake, cmake]
         pch: [true]
         include:
@@ -47,10 +48,6 @@ jobs:
           key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}
 
       # LINUX
-      - name: Install p7zip (Ubuntu)
-        if: startsWith(matrix.os, 'ubuntu')
-        run: sudo apt-get update && sudo apt-get -y install p7zip-full
-
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ba25003..7da3a0f7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ name: Test
 
 on:
   pull_request:
+  workflow_dispatch:
 
 env:
   TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.3
@@ -17,6 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
+        qt-version: [5.15.2]
       fail-fast: false
 
     steps:
@@ -28,20 +30,16 @@ jobs:
         id: cache-qt
         uses: actions/cache@v3
         with:
-          path: ../Qt
-          key: ${{ runner.os }}-QtCache-20201005
+          path: "${{ github.workspace }}/qt/"
+          key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}
 
       # LINUX
-      - name: Install p7zip (Ubuntu)
-        if: startsWith(matrix.os, 'ubuntu')
-        run: sudo apt-get update && sudo apt-get -y install p7zip-full
-
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          aqtversion: '==1.1.1'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
-          extra: --external 7z
+          version: ${{ matrix.qt-version }}
+          dir: "${{ github.workspace }}/qt/"
 
       # LINUX
       - name: Install dependencies (Ubuntu)