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

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 14bfe71f4e0e49c8dba77a43ff42b32a23faa9f9..dc0ba163d78c674b6af313d135cde05fc1b4bfc5 100755 (executable)
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -107,6 +107,10 @@ else # Native Ubuntu Linux Travis builds (non-docker)
     travis_fold meson meson
       OPTS="$OPTS -Dbindings="
     travis_endfold meson
+  elif [ "$TRAVIS_CPU_ARCH" = "s390x" ] ; then
+    travis_fold meson meson
+      OPTS="$OPTS -Dbindings= -Delua=false -Dlua-interpreter=lua"
+    travis_endfold meson
   fi
   if [ "$1" = "codecov" ]; then
     travis_fold meson meson

diff --git a/.ci/ubuntu-bionic-install-deps.sh b/.ci/ubuntu-bionic-install-deps.sh
index 9bb2c0efd198bc6d02acde1fc295e60e681e7cb1..3f08287df132729bc58067d4d27a69e6e621323c 100755 (executable)
--- a/.ci/ubuntu-bionic-install-deps.sh
+++ b/.ci/ubuntu-bionic-install-deps.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
 sudo apt-get update -y
-sudo 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
+sudo 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
+# s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1
+if [ "$TRAVIS_CPU_ARCH" = "s390x" ] ; then
+  sudo apt-get install -y liblua5.1-dev
+else
+  sudo apt-get install -y luajit libluajit-5.1-dev
+fi
 sudo pip3 install meson

diff --git a/.travis.yml b/.travis.yml
index 228ed3cafee36831ebb992b9a4d8aec2975f02da..e1ec7a36f8c92eb34399f13fc5efa013bd9cc1b3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,6 +89,10 @@ jobs:
       if: type = cron
       arch: ppc64le
       env: CI_BUILD_TYPE=no-bindings
+    - os: linux
+      if: type = cron
+      arch: s390x
+      env: CI_BUILD_TYPE=no-bindings
 
 services:
   - docker