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
This commit is contained in:
Kasia 2022-06-14 14:48:21 +02:00 committed by GitHub
parent 683701623a
commit 28744810c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions

View file

@ -6,6 +6,7 @@ on:
branches: branches:
- master - master
pull_request: pull_request:
workflow_dispatch:
concurrency: concurrency:
group: build-${{ github.ref }} group: build-${{ github.ref }}
@ -17,7 +18,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [windows-latest, ubuntu-latest, macos-latest] 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] build-system: [qmake, cmake]
pch: [true] pch: [true]
include: include:
@ -47,10 +48,6 @@ jobs:
key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }} key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}
# LINUX # 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 - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:

View file

@ -3,6 +3,7 @@ name: Test
on: on:
pull_request: pull_request:
workflow_dispatch:
env: env:
TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.3 TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.3
@ -17,6 +18,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04] os: [ubuntu-20.04]
qt-version: [5.15.2]
fail-fast: false fail-fast: false
steps: steps:
@ -28,20 +30,16 @@ jobs:
id: cache-qt id: cache-qt
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ../Qt path: "${{ github.workspace }}/qt/"
key: ${{ runner.os }}-QtCache-20201005 key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}
# LINUX # 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 - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
aqtversion: '==1.1.1'
cached: ${{ steps.cache-qt.outputs.cache-hit }} cached: ${{ steps.cache-qt.outputs.cache-hit }}
extra: --external 7z version: ${{ matrix.qt-version }}
dir: "${{ github.workspace }}/qt/"
# LINUX # LINUX
- name: Install dependencies (Ubuntu) - name: Install dependencies (Ubuntu)