Browse Source

More CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.0-RC1
falkTX 4 years ago
parent
commit
6f4f53441a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 15 additions and 14 deletions
  1. +0
    -1
      .travis.yml
  2. +11
    -9
      .travis/install.sh
  3. +2
    -2
      .travis/script-linux-juce-strict.sh
  4. +2
    -2
      .travis/script-linux-strict.sh

+ 0
- 1
.travis.yml View File

@@ -48,7 +48,6 @@ jobs:
# linux with default, tests python code
- os: linux
compiler: gcc
dist: bionic
env:
- TARGET="pylint"



+ 11
- 9
.travis/install.sh View File

@@ -21,19 +21,21 @@ if [ "${TARGET}" = "linux" ]; then
libx11-6:i386 \
liblo-static \
fluidsynth2-static \
mingw32-x-gcc \
mingw32-x-pkgconfig \
mingw64-x-gcc \
mingw64-x-pkgconfig \
wine-rt-dev
mingw-w64 \
binutils-mingw-w64-i686 \
binutils-mingw-w64-x86-64 \
g++-mingw-w64-i686 \
g++-mingw-w64-x86-64 \
libwine-development-dev \
wine64-development-tools

# Fix for 32bit bridge link
sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so

elif [ "${TARGET}" = "linux-strict" ]; then
sudo apt-get install -y \
g++-8 \
g++-8-multilib \
g++-10 \
g++-10-multilib \
pkg-config \
pyqt5-dev-tools \
python3-pyqt5.qtsvg \
@@ -56,8 +58,8 @@ elif [ "${TARGET}" = "linux-strict" ]; then

elif [ "${TARGET}" = "linux-juce-strict" ]; then
sudo apt-get install -y \
g++-8 \
g++-8-multilib \
g++-10 \
g++-10-multilib \
pkg-config \
pyqt5-dev-tools \
python3-pyqt5.qtsvg \


+ 2
- 2
.travis/script-linux-juce-strict.sh View File

@@ -3,8 +3,8 @@
set -e

# Preparation
export CC=gcc-8
export CXX=g++-8
export CC=gcc-10
export CXX=g++-10
export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
unset CFLAGS
unset CXXFLAGS


+ 2
- 2
.travis/script-linux-strict.sh View File

@@ -3,8 +3,8 @@
set -e

# Preparation
export CC=gcc-8
export CXX=g++-8
export CC=gcc-10
export CXX=g++-10
export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
unset CFLAGS
unset CXXFLAGS


Loading…
Cancel
Save