Skip to content

Commit 430a44e

Browse files
committed
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
2 parents 85f2378 + 3867639 commit 430a44e

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.travis.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@ matrix:
419419
env: SWIGLANG=python GCC=9 CPP17=1 PY3=3 VER=3.8
420420
sudo: required
421421
dist: xenial
422+
- os: linux
423+
arch: s390x
424+
env: SWIGLANG=ruby CPP11=1
425+
sudo: required
426+
dist: xenial
422427
- compiler: gcc
423428
os: osx
424429
env: SWIGLANG=
@@ -468,6 +473,12 @@ matrix:
468473
osx_image: xcode10.2
469474

470475
allow_failures:
476+
# li_std_wstring failure see https://github.com/swig/swig/pull/1803
477+
- os: linux
478+
arch: s390x
479+
env: SWIGLANG=ruby CPP11=1
480+
sudo: required
481+
dist: xenial
471482
# Newer version of D not yet working/supported
472483
- compiler: gcc
473484
os: linux
@@ -495,7 +506,7 @@ matrix:
495506
before_install:
496507
- date -u
497508
- uname -a
498-
- if test "$TRAVIS_OS_NAME" = "linux"; then lscpu && cat /proc/cpuinfo | grep "model name" && cat /proc/meminfo | grep MemTotal; fi
509+
- 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
499510
- if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi
500511
# Travis overrides CC environment with compiler predefined values
501512
- if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi

Tools/travis-linux-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [[ -n "$GCC" ]]; then
1313
travis_retry sudo apt-get install -qq g++-$GCC
1414
fi
1515

16-
travis_retry sudo apt-get -qq install libboost-dev
16+
travis_retry sudo apt-get -qq install libboost-dev libpcre3-dev
1717

1818
WITHLANG=$SWIGLANG
1919

0 commit comments

Comments
 (0)