summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-03-25 13:37:13 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2020-03-27 15:06:13 +0100
commit191171e4c81c1832e9f7b3821c535d8a2b49eb14 (patch)
tree72cc34e617ba75910ded70cf8ae7d194cec4c35d /.ci
parentaa34cc0489519de32dd9d656c4ce51f9743a3b9b (diff)
ci: travis: enable s390x build on daily cron
As there is no luajit package for s390x in Ubuntu Bionic we need to adapt our installed packages as well as config options for it. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D11601
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh4
-rwxr-xr-x.ci/ubuntu-bionic-install-deps.sh8
2 files changed, 11 insertions, 1 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 7eb59f7fbb..10730003e6 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -106,6 +106,10 @@ else # Native Ubuntu Linux Travis builds (non-docker)
106 travis_fold meson meson 106 travis_fold meson meson
107 OPTS="$OPTS -Dbindings=" 107 OPTS="$OPTS -Dbindings="
108 travis_endfold meson 108 travis_endfold meson
109 elif [ "$TRAVIS_CPU_ARCH" = "s390x" ] ; then
110 travis_fold meson meson
111 OPTS="$OPTS -Dbindings= -Delua=false -Dlua-interpreter=lua"
112 travis_endfold meson
109 fi 113 fi
110 if [ "$1" = "codecov" ]; then 114 if [ "$1" = "codecov" ]; then
111 travis_fold meson meson 115 travis_fold meson meson
diff --git a/.ci/ubuntu-bionic-install-deps.sh b/.ci/ubuntu-bionic-install-deps.sh
index 9bb2c0efd1..3f08287df1 100755
--- a/.ci/ubuntu-bionic-install-deps.sh
+++ b/.ci/ubuntu-bionic-install-deps.sh
@@ -1,4 +1,10 @@
1#!/bin/sh 1#!/bin/sh
2sudo apt-get update -y 2sudo apt-get update -y
3sudo apt-get install -y build-essential autoconf automake autopoint doxygen check luajit libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libluajit-5.1-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools libopenjp2-7-dev libc6-dev libpcre3-dev 3sudo apt-get install -y build-essential autoconf automake autopoint doxygen check libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools libopenjp2-7-dev libc6-dev libpcre3-dev
4# s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1
5if [ "$TRAVIS_CPU_ARCH" = "s390x" ] ; then
6 sudo apt-get install -y liblua5.1-dev
7else
8 sudo apt-get install -y luajit libluajit-5.1-dev
9fi
4sudo pip3 install meson 10sudo pip3 install meson