diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a387f50d..b89c0ad30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest, macos-latest] + qt-version: [default, 5.12.10] fail-fast: false steps: @@ -31,20 +32,30 @@ jobs: uses: actions/cache@v2 with: path: ../Qt - key: ${{ runner.os }}-QtCache-20201005 + key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-20210109 # 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 (Default version) uses: jurplel/install-qt-action@v2 + if: ${{ matrix.qt-version == 'default' }} with: # mirror: 'http://mirrors.ocf.berkeley.edu/qt/' cached: ${{ steps.cache-qt.outputs.cache-hit }} extra: --external 7z + - name: Install Qt (Specific version) + uses: jurplel/install-qt-action@v2 + if: ${{ matrix.qt-version != 'default' }} + with: + # mirror: 'http://mirrors.ocf.berkeley.edu/qt/' + cached: ${{ steps.cache-qt.outputs.cache-hit }} + extra: --external 7z + version: ${{ matrix.qt-version }} + # WINDOWS - name: Cache conan if: startsWith(matrix.os, 'windows') @@ -88,7 +99,7 @@ jobs: if: startsWith(matrix.os, 'windows') uses: actions/upload-artifact@v2.2.2 with: - name: chatterino-windows-x86-64.zip + name: chatterino-windows-x86-64-${{ matrix.qt-version }}.zip path: build/chatterino-windows-x86-64.zip # LINUX @@ -132,7 +143,7 @@ jobs: if: startsWith(matrix.os, 'ubuntu') uses: actions/upload-artifact@v2.2.2 with: - name: Chatterino-x86_64.AppImage + name: Chatterino-x86_64-${{ matrix.qt-version }}.AppImage path: build/Chatterino-x86_64.AppImage # MACOS @@ -166,7 +177,7 @@ jobs: if: startsWith(matrix.os, 'macos') uses: actions/upload-artifact@v2.2.2 with: - name: chatterino-osx.dmg + name: chatterino-osx-${{ matrix.qt-version }}.dmg path: build/chatterino-osx.dmg create-release: @@ -190,17 +201,17 @@ jobs: - uses: actions/download-artifact@v2.0.8 with: - name: chatterino-windows-x86-64.zip + name: chatterino-windows-x86-64-default.zip path: windows/ - uses: actions/download-artifact@v2.0.8 with: - name: Chatterino-x86_64.AppImage + name: Chatterino-x86_64-default.AppImage path: linux/ - uses: actions/download-artifact@v2.0.8 with: - name: chatterino-osx.dmg + name: chatterino-osx-default.dmg path: macos/ # TODO: Extract dmg and appimage @@ -221,7 +232,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./windows/chatterino-windows-x86-64.zip + asset_path: ./windows/chatterino-windows-x86-64-default.zip asset_name: chatterino-windows-x86-64.zip asset_content_type: application/zip @@ -231,7 +242,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./linux/Chatterino-x86_64.AppImage + asset_path: ./linux/Chatterino-x86_64-default.AppImage asset_name: Chatterino-x86_64.AppImage asset_content_type: application/x-executable @@ -241,6 +252,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./macos/chatterino-osx.dmg + asset_path: ./macos/chatterino-osx-default.dmg asset_name: chatterino-osx.dmg asset_content_type: application/x-bzip2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f26dcf14..a532cb10b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,7 @@ - Dev: Updated minimum required Qt framework version to 5.12. (#2210) - Dev: Migrated `Kraken::getUser` to Helix (#2260) - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306) +- Dev: Build in CI with multiple Qt versions (#2349) ## 2.2.2 diff --git a/lib/libcommuni b/lib/libcommuni index ff79c7292..28e798a64 160000 --- a/lib/libcommuni +++ b/lib/libcommuni @@ -1 +1 @@ -Subproject commit ff79c7292b9e45cffcbe5b717ef55c3fc7d5ef01 +Subproject commit 28e798a642e0916e5b94b1698c9fd3c8a3c7a126