From 2535df503f636fb7bbd7433665766c984d70946c Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 14 Apr 2022 10:41:48 +0900 Subject: [PATCH 1/2] set QEMU=aarch64 DOCEKR_IAMGE=arm64v8/ubuntu skip jskeus test --- .github/workflows/config.yml | 4 ++-- .travis.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 36cbe8e13..f43bab0d0 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -29,9 +29,9 @@ jobs: - DOCKER_IMAGE: osrf/ubuntu_armhf:xenial - DOCKER_IMAGE: osrf/ubuntu_arm64:trusty - DOCKER_IMAGE: osrf/ubuntu_arm64:xenial - - QEMU: aarach64 + - QEMU: aarch64 DOCKER_IMAGE: arm64v8/ubuntu:bionic - - QEMU: aarach64 + - QEMU: aarch64 DOCKER_IMAGE: arm64v8/ubuntu:focal - DOCKER_IMAGE: osrf/debian_arm64:stretch - DOCKER_IMAGE: amd64/debian:unstable diff --git a/.travis.sh b/.travis.sh index c147effd1..1fb4ea247 100755 --- a/.travis.sh +++ b/.travis.sh @@ -67,7 +67,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then fi ### for multiarch compile test -if [ "$QEMU" != "" ]; then +if [[ "$QEMU" != "" && "$DOCKER_IMAGE" != "arm64v8/ubuntu:"* ]]; then travis_time_start install.dpkg-dev apt-get install -qq -y dpkg-dev patchutils travis_time_end From 581036537bfdd83a00f2094459a851f905647a97 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 16 Apr 2022 16:59:21 +0900 Subject: [PATCH 2/2] use ubuntu-18.04 for host machine, in order to use previous qemu version https://launchpad.net/qemu/+packages --- .github/workflows/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index f43bab0d0..2847d4624 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -64,7 +64,7 @@ jobs: # sparc64 fail-fast: false - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 timeout-minutes: 60 name: linux