diff options
| author | Jack Lloyd <[email protected]> | 2020-12-02 06:41:36 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-12-02 06:48:42 -0500 |
| commit | dc022a6335e047035779e026a71533c5b1b0ccc2 (patch) | |
| tree | 0de2ec4fa513c2b365a67806fb0dedf9dae164b4 /src/scripts | |
| parent | 63d51cb1ab08849d8ece329811b61f8c9abebbcf (diff) | |
Add back arm32 and s390x builds to Travis
Diffstat (limited to 'src/scripts')
| -rwxr-xr-x | src/scripts/ci/setup_gh_actions.sh | 7 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 12 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 3 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/scripts/ci/setup_gh_actions.sh b/src/scripts/ci/setup_gh_actions.sh index 636b7ead1..5a9173834 100755 --- a/src/scripts/ci/setup_gh_actions.sh +++ b/src/scripts/ci/setup_gh_actions.sh @@ -27,13 +27,6 @@ if type -p "apt-get"; then elif [ "$TARGET" = "cross-win64" ]; then sudo apt-get -qq install wine-development g++-mingw-w64-x86-64 - elif [ "$TARGET" = "cross-arm32" ]; then - sudo dpkg --add-architecture armhf - # need to re-update after --add-architecture - sudo apt-get -qq update - sudo apt-get -qq install g++-arm-linux-gnueabihf - sudo apt-get -qq install -o APT::Immediate-Configure=0 libc6:armhf libstdc++6:armhf - elif [ "$TARGET" = "cross-arm64" ]; then sudo apt-get -qq install qemu-user g++-aarch64-linux-gnu diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index 1337cc95c..146049c00 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -5,6 +5,11 @@ compiler: gcc jobs: include: + - name: Linux s390x (GCC) + arch: s390x + env: + - TARGET="shared" + - name: Linux ppc64le (GCC) arch: ppc64le env: @@ -15,11 +20,16 @@ jobs: env: - TARGET="shared" + - name: Linux arm32 cross (GCC) + arch: arm64 + env: + - TARGET="cross-arm32" + install: - ./src/scripts/ci/setup_travis.sh script: - - ./src/scripts/ci_build.py --os=$TRAVIS_OS_NAME --cc=$CC --cc-bin=$CXX --without-pylint3 --pkcs11-lib=$PKCS11_LIB $EXTRA_FLAGS $TARGET + - ./src/scripts/ci_build.py --os=$TRAVIS_OS_NAME --cc=$CC --cc-bin=$CXX --without-pylint3 $EXTRA_FLAGS $TARGET # whitelist branches to avoid testing feature branches twice (as branch and as pull request) branches: diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 50d9d0348..84960f682 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -200,7 +200,8 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, if target == 'cross-arm32': flags += ['--cpu=armv7'] cc_bin = 'arm-linux-gnueabihf-g++' - test_prefix = ['qemu-arm', '-L', '/usr/arm-linux-gnueabihf/'] + # Currently arm32 CI only runs on native AArch64 + #test_prefix = ['qemu-arm', '-L', '/usr/arm-linux-gnueabihf/'] elif target == 'cross-arm64': flags += ['--cpu=aarch64'] cc_bin = 'aarch64-linux-gnu-g++' |