From: gg Date: Wed, 14 Jan 2026 20:19:03 +0000 (-0500) Subject: try ubuntu 20.04 with default Qt 5.12 X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=d90ac3b011f132a3614ed745d4081d347cb8fd2f;p=gamesguru%2Ffeather.git try ubuntu 20.04 with default Qt 5.12 --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3630fa1..9e2b3a2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: cmake --build . -j $(nproc) build-ubuntu-20: - name: "Ubuntu 20.04" + name: "Ubuntu 20.04 (Default Qt 5.12)" runs-on: ubuntu-latest container: image: ubuntu:20.04 @@ -72,12 +72,9 @@ jobs: run: apt update - name: install dependencies run: | - apt -y install software-properties-common - add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal - apt update - apt -y install git cmake build-essential ccache libssl-dev libunbound-dev libboost-all-dev \ - libqrencode-dev qt515base qt515svg qt515websockets qt515multimedia \ - libzip-dev libsodium-dev libgcrypt20-dev libx11-xcb-dev \ + apt -y install git cmake build-essential ccache libssl-dev libunbound-dev \ + libboost-all-dev libqrencode-dev qtbase5-dev libqt5svg5-dev libqt5websockets5-dev \ + qtmultimedia5-dev libzip-dev libsodium-dev libgcrypt20-dev libx11-xcb-dev \ protobuf-compiler libprotobuf-dev libhidapi-dev libusb-dev libusb-1.0-0-dev - name: configure git run: git config --global --add safe.directory '*' @@ -86,7 +83,6 @@ jobs: submodules: recursive - name: build run: | - . /opt/qt515/bin/qt515-env.sh mkdir build cd build cmake -DWITH_SCANNER=OFF ..