From 9a9c1269b4a4584180b7919845c6978be02e62e7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 19 Aug 2021 16:47:58 +0100 Subject: [PATCH] CI tweaks Signed-off-by: falkTX --- .github/workflows/build.yml | 6 ++++-- .github/workflows/wine.yml | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e2b3d127..d0d79b117 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,8 @@ jobs: - name: Set up dependencies run: | sudo apt-get update -qq - sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libqt4-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev + sudo apt-get install -yq libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libqt4-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev + sudo apt-get install -yq g++-multilib libfreetype6:i386 libx11-6:i386 libxext6:i386 # Fix 32bit bridge build sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so @@ -82,7 +83,8 @@ jobs: - name: Set up dependencies run: | sudo apt-get update -qq - sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev + sudo apt-get install -yq libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev + sudo apt-get install -yq g++-multilib libfreetype6:i386 libx11-6:i386 libxext6:i386 # Fix 32bit bridge build sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml index 3ef85d64d..08084828b 100644 --- a/.github/workflows/wine.yml +++ b/.github/workflows/wine.yml @@ -25,8 +25,8 @@ jobs: sudo apt-get update -qq sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-tools sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 - - name: make wine32 - run: make wine32 -j $(nproc) + #- name: make wine32 + #run: make wine32 -j $(nproc) - name: make wine64 run: make wine64 -j $(nproc) - name: make win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ @@ -51,8 +51,8 @@ jobs: sudo apt-get update -qq sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-tools sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 - - name: make wine32 - run: make wine32 -j $(nproc) + #- name: make wine32 + #run: make wine32 -j $(nproc) - name: make wine64 run: make wine64 -j $(nproc) - name: make win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++