From c139447dd8589b50549f53ebede516887b806409 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 11 Dec 2021 21:14:30 +0400 Subject: [PATCH] One another attempt to fix Linux action --- .github/workflows/linux-kotato.yml | 62 +++++++++++++++++++----------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/.github/workflows/linux-kotato.yml b/.github/workflows/linux-kotato.yml index bbcb58202..7157651aa 100644 --- a/.github/workflows/linux-kotato.yml +++ b/.github/workflows/linux-kotato.yml @@ -93,14 +93,13 @@ jobs: p doc - name: Apt install. - shell: bash run: | apt-get update apt-get install software-properties-common -y && \ add-apt-repository ppa:git-core/ppa -y && \ apt-get update && \ apt-get install clang libglibmm-2.4-dev libicu-dev libssl-dev liblzma-dev zlib1g-dev \ - git wget autoconf automake build-essential libtool pkg-config bison nasm yasm unzip \ + git wget autoconf automake build-essential libtool pkg-config bison yasm unzip python3-pip \ libasound2-dev libpulse-dev libfuse2 libgtk-3-dev libgtk2.0-dev libatspi2.0-dev \ libgl1-mesa-dev libegl1-mesa-dev libxkbcommon-dev libxkbcommon-x11-dev libxcb1-dev \ libxcb-glx0-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev \ @@ -124,7 +123,6 @@ jobs: path: ${{ env.REPO_NAME }} - name: First set up. - shell: bash run: | wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" chmod a+x linuxdeployqt-continuous-x86_64.AppImage @@ -182,19 +180,35 @@ jobs: git clone -b v5.88.0 --depth=1 $GIT/KDE/extra-cmake-modules.git cd extra-cmake-modules - cmake . -DCMAKE_BUILD_TYPE=Release - cmake --build . --parallel - cmake --install . + cmake -B build -GNinja . -DCMAKE_BUILD_TYPE=Release + cmake --build build --parallel + cmake --install build cd .. rm -rf extra-cmake-modules + - name: Meson. + run: | + python3 -m pip install meson==0.54.0 + meson --version + + - name: Ninja. + run: | + cd $LibrariesPath + + wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip + unzip ninja-linux.zip + chmod +x ninja + mv ninja /usr/local/bin + + ninja --version + - name: MozJPEG. run: | cd $LibrariesPath git clone -b v4.0.3 --depth=1 $GIT/mozilla/mozjpeg.git cd mozjpeg - cmake -B build . \ + cmake -B build -GNinja . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DWITH_JPEG8=ON \ @@ -277,16 +291,16 @@ jobs: cd $LibrariesPath git clone -b fix_pulse_default --depth=1 $GIT/telegramdesktop/openal-soft.git - cd openal-soft/build - cmake .. \ + cd openal-soft + cmake -B build -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DALSOFT_EXAMPLES=OFF \ -DALSOFT_TESTS=OFF \ -DALSOFT_UTILS=OFF \ -DALSOFT_CONFIG=OFF - cmake --build . --parallel - cmake --install . + cmake --build build --parallel + cmake --install build ldconfig cd - @@ -310,7 +324,7 @@ jobs: git clone -b v1.4.0 --depth=1 $GIT/KDE/plasma-wayland-protocols.git cd plasma-wayland-protocols - cmake -B build . -DCMAKE_BUILD_TYPE=Release + cmake -B build -GNinja . -DCMAKE_BUILD_TYPE=Release cmake --build build --parallel cmake --install build cd .. @@ -381,12 +395,12 @@ jobs: git clone -b v5.88.0 --depth=1 $GIT/KDE/kwayland.git cd kwayland - cmake . \ + cmake -B build -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=OFF \ -DKDE_INSTALL_LIBDIR=lib - cmake --build . --parallel - cmake --install . + cmake --build build --parallel + cmake --install build ldconfig cd .. rm -rf kwayland @@ -413,9 +427,9 @@ jobs: svn checkout https://svn.code.sf.net/p/qt5ct/code/tags/qt5ct-1.5 qt5ct cd qt5ct - cmake . -DCMAKE_BUILD_TYPE=Release - cmake --build . --parallel - cmake --install . + cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release + cmake --build build --parallel + cmake --install build cd .. rm -rf qt5ct @@ -425,9 +439,9 @@ jobs: git clone -b V0.20.2 --depth=1 $GIT/tsujan/Kvantum.git cd Kvantum/Kvantum - cmake . -DCMAKE_BUILD_TYPE=Release - cmake --build . --parallel - cmake --install . + cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release + cmake --build build --parallel + cmake --install build cd ../.. rm -rf Kvantum @@ -455,7 +469,11 @@ jobs: meson build -Dspa-plugins=disabled cd ../../.. - cmake -B build . -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DTG_OWT_DLOPEN_PIPEWIRE=ON + cmake -B build -GNinja . \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -DTG_OWT_DLOPEN_PIPEWIRE=ON + cmake --build build --parallel - name: Kotatogram Desktop build.