revive travis s390x and fix x86.as test

This commit is contained in:
eagleoflqj 2020-11-09 21:51:55 -05:00 committed by Anton Kochkov
parent ab38a9eb55
commit 53fb2ded53
1 changed files with 4 additions and 4 deletions

View File

@ -42,11 +42,11 @@ jobs:
name: S390X
arch: s390x
dist: bionic
env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-linux-gnu-as
env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-w64-mingw32-as
addons:
apt:
packages:
- gcc-x86-64-linux-gnu
- binutils-mingw-w64-x86-64
# Linux with GCC on ARMv8 (64bit)
- if: (branch = master AND type = push) OR head_branch =~ ^arm64-*
os: linux
@ -100,11 +100,11 @@ jobs:
# Linux with GCC on System Z
- os: linux
arch: s390x
env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-linux-gnu-as
env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-w64-mingw32-as
addons:
apt:
packages:
- gcc-x86-64-linux-gnu
- binutils-mingw-w64-x86-64
# Linux with GCC on ARMv8 (64bit)
- os: linux
arch: arm64