Merge branch 'ruby-bigendian'

* ruby-bigendian:
  Travis ruby s390x (big endian) architecture testing
  Install libpcre3-dev for Linux builds
  Don't fail the build if CPU model or memory can't be detected
  Switch one of Travis CI Ruby builds to use s390x arch
This commit is contained in:
William S Fulton 2020-06-02 23:27:05 +01:00
commit 430a44e075
2 changed files with 13 additions and 2 deletions

View file

@ -419,6 +419,11 @@ matrix:
env: SWIGLANG=python GCC=9 CPP17=1 PY3=3 VER=3.8 env: SWIGLANG=python GCC=9 CPP17=1 PY3=3 VER=3.8
sudo: required sudo: required
dist: xenial dist: xenial
- os: linux
arch: s390x
env: SWIGLANG=ruby CPP11=1
sudo: required
dist: xenial
- compiler: gcc - compiler: gcc
os: osx os: osx
env: SWIGLANG= env: SWIGLANG=
@ -468,6 +473,12 @@ matrix:
osx_image: xcode10.2 osx_image: xcode10.2
allow_failures: allow_failures:
# li_std_wstring failure see https://github.com/swig/swig/pull/1803
- os: linux
arch: s390x
env: SWIGLANG=ruby CPP11=1
sudo: required
dist: xenial
# Newer version of D not yet working/supported # Newer version of D not yet working/supported
- compiler: gcc - compiler: gcc
os: linux os: linux
@ -495,7 +506,7 @@ matrix:
before_install: before_install:
- date -u - date -u
- uname -a - uname -a
- if test "$TRAVIS_OS_NAME" = "linux"; then lscpu && cat /proc/cpuinfo | grep "model name" && cat /proc/meminfo | grep MemTotal; fi - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu; grep "model name" /proc/cpuinfo || echo 'Unknown CPU model'; grep "MemTotal" /proc/meminfo || echo 'Unknown system memory amount'; fi
- if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi - if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi
# Travis overrides CC environment with compiler predefined values # Travis overrides CC environment with compiler predefined values
- if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi - if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi

View file

@ -13,7 +13,7 @@ if [[ -n "$GCC" ]]; then
travis_retry sudo apt-get install -qq g++-$GCC travis_retry sudo apt-get install -qq g++-$GCC
fi fi
travis_retry sudo apt-get -qq install libboost-dev travis_retry sudo apt-get -qq install libboost-dev libpcre3-dev
WITHLANG=$SWIGLANG WITHLANG=$SWIGLANG