Browse Source

CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.4.0
falkTX 3 years ago
parent
commit
9a9c1269b4
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 6 deletions
  1. +4
    -2
      .github/workflows/build.yml
  2. +4
    -4
      .github/workflows/wine.yml

+ 4
- 2
.github/workflows/build.yml View File

@@ -63,7 +63,8 @@ jobs:
- name: Set up dependencies - name: Set up dependencies
run: | run: |
sudo apt-get update -qq 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 # 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/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 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 - name: Set up dependencies
run: | run: |
sudo apt-get update -qq 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 # 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/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 sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so


+ 4
- 4
.github/workflows/wine.yml View File

@@ -25,8 +25,8 @@ jobs:
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-tools 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 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 - name: make wine64
run: make wine64 -j $(nproc) run: make wine64 -j $(nproc)
- name: make win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ - 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 update -qq
sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-tools 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 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 - name: make wine64
run: make wine64 -j $(nproc) run: make wine64 -j $(nproc)
- name: make win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ - name: make win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++


Loading…
Cancel
Save