diff options
| author | Anthony Green <green@moxielogic.com> | 2019-11-24 16:09:44 -0500 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2019-11-24 16:09:44 -0500 |
| commit | 86be66c8f608a84caea2ef724698093d2da2e5e2 (patch) | |
| tree | 68f29dd118df876a58bb9dfbfb165d255b19fb8a | |
| parent | fd99c95f90f85963f5ec88630c0428a8132012db (diff) | |
| download | libffi-86be66c8f608a84caea2ef724698093d2da2e5e2.tar.gz | |
Try travis-ci's new ppc64le and s390x support
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | .travis/build.sh | 13 |
2 files changed, 9 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 7cd3a18..5b4bc84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ matrix: - os: linux env: HOST=m68k-linux-gnu MEVAL='export CC="m68k-linux-gnu-gcc-8 -mcpu=547x" && CXX="m68k-linux-gnu-g++-8 -mcpu=547x"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/m68k-linux-gnu QEMU_CPU=cfv4e - os: linux - env: HOST=s390x-linux-gnu MEVAL='export CC="s390x-linux-gnu-gcc-8" && CXX="s390x-linux-gnu-g++-8"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/s390x-linux-gnu QEMU_CPU=max + arch: s390x + - os: linux + arch: ppc64le - os: linux env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0" - os: linux @@ -39,9 +41,6 @@ matrix: # The sparc64 linux system in the GCC compile farm is non-responsive. # - os: linux # env: HOST=sparc64-linux-gnu -# Having problems getting logs for this one... -# - os: linux -# env: HOST=powerpc64le-unknown-linux-gnu # - os: linux # env: HOST=aarch64-linux-gnu # The mips64 linux system in the GCC compile farm is not allowing logins diff --git a/.travis/build.sh b/.travis/build.sh index db596b3..c134f57 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -11,8 +11,7 @@ fi # Default to podman where available, docker otherwise. # Override by setting the DOCKER environment variable. if test -z "$DOCKER"; then - which podman > /dev/null 2>&1 - if [ $? != 0 ]; then + if command -v podman > /dev/null; then export DOCKER=docker else export DOCKER=podman @@ -50,7 +49,7 @@ function build_linux() function build_foreign_linux() { - ${DOCKER} run --rm -t -i -v `pwd`:/opt ${SET_QEMU_CPU} -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.travis/build-in-container.sh + ${DOCKER} run --rm -t -i -v $(pwd):/opt ${SET_QEMU_CPU} -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.travis/build-in-container.sh ./rlgl l https://rl.gl ID=$(./rlgl start) @@ -60,7 +59,7 @@ function build_foreign_linux() function build_cross_linux() { - ${DOCKER} run --rm -t -i -v `pwd`:/opt ${SET_QEMU_CPU} -e HOST="${HOST}" -e CC="${HOST}-gcc-8 ${GCC_OPTIONS}" -e CXX="${HOST}-g++-8 ${GCC_OPTIONS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh + ${DOCKER} run --rm -t -i -v $(pwd):/opt ${SET_QEMU_CPU} -e HOST="${HOST}" -e CC="${HOST}-gcc-8 ${GCC_OPTIONS}" -e CXX="${HOST}-g++-8 ${GCC_OPTIONS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh ./rlgl l https://rl.gl ID=$(./rlgl start) @@ -71,7 +70,7 @@ function build_cross_linux() function build_cross() { ${DOCKER} pull quay.io/moxielogic/libffi-ci-${HOST} - ${DOCKER} run --rm -t -i -v `pwd`:/opt -e HOST="${HOST}" -e CC="${HOST}-gcc ${GCC_OPTIONS}" -e CXX="${HOST}-g++ ${GCC_OPTIONS}" -e TRAVIS_BUILD_DIR=/opt -e DEJAGNU="${DEJAGNU}" -e RUNTESTFLAGS="${RUNTESTFLAGS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" quay.io/moxielogic/libffi-ci-${HOST} bash -c /opt/.travis/build-cross-in-container.sh + ${DOCKER} run --rm -t -i -v $(pwd):/opt -e HOST="${HOST}" -e CC="${HOST}-gcc ${GCC_OPTIONS}" -e CXX="${HOST}-g++ ${GCC_OPTIONS}" -e TRAVIS_BUILD_DIR=/opt -e DEJAGNU="${DEJAGNU}" -e RUNTESTFLAGS="${RUNTESTFLAGS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" quay.io/moxielogic/libffi-ci-${HOST} bash -c /opt/.travis/build-cross-in-container.sh ./rlgl l https://rl.gl ID=$(./rlgl start) @@ -112,7 +111,7 @@ case "$HOST" in ./autogen.sh build_foreign_linux arm moxielogic/arm32v7-ci-build-container:latest ;; - aarch64-linux-gnu| powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu) + aarch64-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu) build_cfarm ;; bfin-elf ) @@ -131,7 +130,7 @@ case "$HOST" in ./autogen.sh GCC_OPTIONS=-mcpu=547x build_cross_linux ;; - alpha-linux-gnu | sh4-linux-gnu | s390x-linux-gnu ) + alpha-linux-gnu | sh4-linux-gnu ) ./autogen.sh build_cross_linux ;; |