random ci test things (#4725)

* test

* Simplify qt install action usage

* Add merge_group to the actions
This commit is contained in:
pajlada 2023-07-29 13:02:43 +02:00 committed by GitHub
parent 4286ee4ca4
commit 8cfa5e866e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 17 deletions

View file

@ -7,6 +7,7 @@ on:
- master
pull_request:
workflow_dispatch:
merge_group:
concurrency:
group: build-${{ github.ref }}

View file

@ -6,6 +6,7 @@ on:
branches:
- master
pull_request:
merge_group:
concurrency:
group: check-formatting-${{ github.ref }}

View file

@ -6,6 +6,7 @@ on:
branches:
- master
pull_request:
merge_group:
concurrency:
group: lint-${{ github.ref }}

View file

@ -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.')
- name: Install Qt
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.')
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