Browse Source

More CI tweaks

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

+ 1
- 1
.travis.yml View File

@@ -2,7 +2,7 @@ language: cpp

os: linux

dist: focal
dist: bionic

jobs:
include:


+ 7
- 2
.travis/before_install.sh View File

@@ -2,12 +2,17 @@

set -e

if [ "${TARGET}" = "win32" ]; then
sudo dpkg --add-architecture i386
fi

sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio
sudo add-apt-repository -y ppa:kxstudio-debian/mingw
sudo add-apt-repository -y ppa:kxstudio-debian/toolchain

if [ "${TARGET}" = "linux-strict" ] || [ "${TARGET}" = "linux-juce-strict" ]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
if [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; then
wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
sudo apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
fi

sudo apt-get update -qq


+ 3
- 4
.travis/install.sh View File

@@ -26,8 +26,7 @@ if [ "${TARGET}" = "linux" ]; then
binutils-mingw-w64-x86-64 \
g++-mingw-w64-i686 \
g++-mingw-w64-x86-64 \
wine-stable \
wine-stable-dev
wine-stable

# Fix for 32bit bridge link
sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
@@ -35,7 +34,7 @@ if [ "${TARGET}" = "linux" ]; then
elif [ "${TARGET}" = "linux-strict" ]; then
sudo apt-get install -y \
g++-multilib \
g++-10-multilib \
g++-9-multilib \
pkg-config \
pyqt5-dev-tools \
python3-pyqt5.qtsvg \
@@ -59,7 +58,7 @@ elif [ "${TARGET}" = "linux-strict" ]; then
elif [ "${TARGET}" = "linux-juce-strict" ]; then
sudo apt-get install -y \
g++-multilib \
g++-10-multilib \
g++-9-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-10
export CXX=g++-10
export CC=gcc-9
export CXX=g++-9
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-10
export CXX=g++-10
export CC=gcc-9
export CXX=g++-9
export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
unset CFLAGS
unset CXXFLAGS


Loading…
Cancel
Save