diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2020-06-02 23:27:05 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2020-06-02 23:27:05 +0100 |
| commit | 430a44e075bb26b2a1b4159846945969f495ad5b (patch) | |
| tree | d72e65ff89c9952e9e2082ebec23aed658a99e1a /.travis.yml | |
| parent | 85f2378b8406fa8ce432f342a55fc585d70f2a97 (diff) | |
| parent | 3867639897aad9fb2c48dc84ddab47c9c8206689 (diff) | |
| download | swig-430a44e075bb26b2a1b4159846945969f495ad5b.tar.gz | |
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
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 385e7be42..d13bd9b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -419,6 +419,11 @@ matrix: env: SWIGLANG=python GCC=9 CPP17=1 PY3=3 VER=3.8 sudo: required dist: xenial + - os: linux + arch: s390x + env: SWIGLANG=ruby CPP11=1 + sudo: required + dist: xenial - compiler: gcc os: osx env: SWIGLANG= @@ -468,6 +473,12 @@ matrix: osx_image: xcode10.2 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 - compiler: gcc os: linux @@ -495,7 +506,7 @@ matrix: before_install: - date -u - 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 # Travis overrides CC environment with compiler predefined values - if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi |