random ci test things (#4725)

* test * Simplify qt install action usage * Add merge_group to the actions
Chatterino · Jul 29, 2023 · 8cfa5e8 · 8cfa5e8
1 parent 4286ee4
commit 8cfa5e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
       - master
   pull_request:
   workflow_dispatch:
+  merge_group:
 
 concurrency:
   group: build-${{ github.ref }}

diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
   pull_request:
+  merge_group:
 
 concurrency:
   group: check-formatting-${{ github.ref }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
   pull_request:
+  merge_group:
 
 concurrency:
   group: lint-${{ github.ref }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,6 +4,7 @@ name: Test
 on:
   pull_request:
   workflow_dispatch:
+  merge_group:
 
 env:
   TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.6
@@ -26,33 +27,21 @@ jobs:
           - os: "ubuntu-22.04"
             qt-version: "6.2.4"
       fail-fast: false
+    env:
+      C2_BUILD_WITH_QT6: ${{ startsWith(matrix.qt-version, '6.') && 'ON' || 'OFF' }}
+      QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }}
 
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Set BUILD_WITH_QT6
-        if: startsWith(matrix.qt-version, '6.')
-        run: |
-          echo "C2_BUILD_WITH_QT6=ON" >> "$GITHUB_ENV"
-        shell: bash
-
-      - name: Install Qt5
-        if: startsWith(matrix.qt-version, '5.')
-        uses: jurplel/install-qt-action@v3.2.1
-        with:
-          cache: true
-          cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
-          version: ${{ matrix.qt-version }}
-
-      - name: Install Qt6
-        if: startsWith(matrix.qt-version, '6.')
+      - name: Install Qt
         uses: jurplel/install-qt-action@v3.2.1
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
-          modules: qt5compat qtimageformats
+          modules: ${{ env.QT_MODULES }}
           version: ${{ matrix.qt-version }}
 
       # LINUX