From df35781351622435d869f1e4aec4d53154d076de Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 23 Jan 2019 10:51:00 +1100 Subject: [PATCH] added 32-bit support to travis yaml --- .travis.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e207f875d..7f31fe05e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,24 @@ compiler: gcc sudo: require dist: trusty +matrix: + include: + - env: ARCH=x86_64 + - env: ARCH=i386 + before_install: - sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y - - sudo sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y + - sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y - sudo apt-get update -qq install: - - sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins + - if [ "$ARCH" == "x86_64" ]; then sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins; fi + - if [ "$ARCH" == "i386" ]; then sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386; fi - source /opt/qt*/bin/qt*-env.sh script: - - qmake CONFIG+=release PREFIX=/usr + - if [ "$ARCH" == "x86_64" ]; then qmake CONFIG+=release PREFIX=/usr; fi + - if [ "$ARCH" == "i386" ]; then qmake CONFIG+=release "CFLAGS += -m32" "QMAKE_CXXFLAGS += -m32" PREFIX=/usr -spec linux-g++-32; fi - make -j$(nproc) - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ - mkdir -p appdir/usr/bin/ ; cp olive-editor appdir/usr/bin/ # FIXME; "make install" should do this @@ -25,7 +32,7 @@ script: after_success: - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - - # curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-x86_64.AppImage + - # curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # only create release for master - if [ "$TRAVIS_BRANCH" != "master" ]; then export TRAVIS_EVENT_TYPE=pull_request; fi