diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b67a9798..f7c45ca2d 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 8ba250038..7da3a0f7b 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)