Browse Source

More CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.1
falkTX 1 year ago
parent
commit
5f7020f73d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 22 additions and 13 deletions
  1. +2
    -2
      .travis.yml
  2. +15
    -11
      .travis/before_install.sh
  3. +5
    -0
      .travis/install.sh

+ 2
- 2
.travis.yml View File

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

os: linux

dist: bionic
dist: focal

jobs:
include:
@@ -60,4 +60,4 @@ script:

notifications:
email: true
irc: "ircs://chat.freenode.net:7070/#kxstudio"
irc: "ircs://chat.libera.chat:7070/#kxstudio"

+ 15
- 11
.travis/before_install.sh View File

@@ -2,23 +2,27 @@

set -e

if [ "${TARGET}" = "macos-native" ] || [ "${TARGET}" = "macos-universal" ]; then
exit 0
fi

if [ "${TARGET}" = "macos" ]; then
rm -f /etc/apt/sources.list.d/*.list
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
sudo apt-get update -qq
sudo apt-get install kxstudio-repos
sudo apt-get update -qq
exit 0
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" ]; then
if [ "${TARGET}" = "linux" ] || [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; then
wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
sudo add-apt-repository -y ppa:kxstudio-debian/ubuntus
sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
sudo dpkg --add-architecture i386
elif [ "${TARGET}" = "linux-strict" ] || [ "${TARGET}" = "linux-juce-strict" ]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
fi

sudo apt-get update -qq
sudo apt-get install kxstudio-repos
sudo apt-get update -qq
sudo apt-get install -y -o APT::Immediate-Configure=false libc6 libc6:i386 libgcc-s1:i386
sudo apt-get install -y -f

+ 5
- 0
.travis/install.sh View File

@@ -91,6 +91,11 @@ elif [ "${TARGET}" = "macos" ]; then
pkg-config \
apple-x86-setup

elif [ "${TARGET}" = "macos-native" ] || [ "${TARGET}" = "macos-universal" ]; then
HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake jq meson
exit 0
fi

elif [ "${TARGET}" = "win32" ]; then
sudo apt-get install -y \
g++-multilib \


Loading…
Cancel
Save