diff options
| author | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 19:19:04 +0200 |
|---|---|---|
| committer | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 19:19:04 +0200 |
| commit | fefaad53943d8b542bd8f288dae7d15e08c67b32 (patch) | |
| tree | 37a27a49e48af87ff0ea00cd0556cb367c3562b2 /.github/workflows/build.yml | |
| parent | 1ef96383c8f7ed136a0e028aef0835b4838b5e95 (diff) | |
| parent | 469e293a1885e49f1d5994d41ac7cfc9f4666952 (diff) | |
Merge branch 'master' into kaleidoscope
Diffstat (limited to '.github/workflows/build.yml')
| -rw-r--r-- | .github/workflows/build.yml | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dafe6aab..0c12c61c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,9 @@ jobs: rm -rf $ANDROID_HOME/ndk/25.2.9519653 ln -sf $ANDROID_HOME/ndk/21.4.7075529 $ANDROID_HOME/ndk/25.2.9519653 - - uses: jurplel/install-qt-action@v3 + - name: Install Qt + if: matrix.os != 'ubuntu-latest' + uses: jurplel/install-qt-action@v3 id: qt with: version: ${{matrix.version}} @@ -84,6 +86,13 @@ jobs: cache: true cache-key-prefix: qt + - name: Install Qt (Ubuntu) + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt-get update + sudo apt-get upgrade + sudo apt-get install qtbase5-dev libqt5websockets5-dev qttools5-dev qt5-image-formats-plugins + - name: Add tools to PATH (MinGW) if: matrix.platform == 'mingw81_32' shell: bash @@ -93,7 +102,7 @@ jobs: if: contains(matrix.platform, 'msvc') uses: ilammy/msvc-dev-cmd@v1 - - name: Install QtApng + - name: Build QtApng run: | git clone https://github.com/Skycoder42/QtApng.git cd QtApng @@ -103,7 +112,18 @@ jobs: cd ../.. qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation" QT_PLATFORM=${{matrix.platform}} ${{matrix.make}} + + - name: Install QtApng + if: matrix.os != 'ubuntu-latest' + run: | + cd QtApng ${{matrix.make}} INSTALL_ROOT="${Qt5_DIR}" install + + - name: Install QtApng (Ubuntu) + if: matrix.os == 'ubuntu-latest' + run: | + cd QtApng + sudo ${{matrix.make}} install - name: Install Windows Discord RPC if: contains(matrix.os, 'windows') |