mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
random ci test things (#4725)
* test * Simplify qt install action usage * Add merge_group to the actions
This commit is contained in:
parent
4286ee4ca4
commit
8cfa5e866e
4 changed files with 9 additions and 17 deletions
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
|
@ -7,6 +7,7 @@ on:
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
merge_group:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: build-${{ github.ref }}
|
group: build-${{ github.ref }}
|
||||||
|
|
1
.github/workflows/check-formatting.yml
vendored
1
.github/workflows/check-formatting.yml
vendored
|
@ -6,6 +6,7 @@ on:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
|
merge_group:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: check-formatting-${{ github.ref }}
|
group: check-formatting-${{ github.ref }}
|
||||||
|
|
1
.github/workflows/lint.yml
vendored
1
.github/workflows/lint.yml
vendored
|
@ -6,6 +6,7 @@ on:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
|
merge_group:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: lint-${{ github.ref }}
|
group: lint-${{ github.ref }}
|
||||||
|
|
23
.github/workflows/test.yml
vendored
23
.github/workflows/test.yml
vendored
|
@ -4,6 +4,7 @@ name: Test
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
merge_group:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.6
|
TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.6
|
||||||
|
@ -26,33 +27,21 @@ jobs:
|
||||||
- os: "ubuntu-22.04"
|
- os: "ubuntu-22.04"
|
||||||
qt-version: "6.2.4"
|
qt-version: "6.2.4"
|
||||||
fail-fast: false
|
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:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- name: Set BUILD_WITH_QT6
|
- name: Install Qt
|
||||||
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
|
uses: jurplel/install-qt-action@v3.2.1
|
||||||
with:
|
with:
|
||||||
cache: true
|
cache: true
|
||||||
cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
|
cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
|
||||||
version: ${{ matrix.qt-version }}
|
modules: ${{ env.QT_MODULES }}
|
||||||
|
|
||||||
- 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
|
|
||||||
version: ${{ matrix.qt-version }}
|
version: ${{ matrix.qt-version }}
|
||||||
|
|
||||||
# LINUX
|
# LINUX
|
||||||
|
|
Loading…
Reference in a new issue