Skip to content

Commit 0033f2e

Browse files
authored
Merge pull request #489 from k-okada/fix_ga
set QEMU=aarch64 DOCEKR_IAMGE=arm64v8/ubuntu for not to skip jskeus test
2 parents b55ce59 + cb43871 commit 0033f2e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
- DOCKER_IMAGE: osrf/ubuntu_armhf:xenial
3030
- DOCKER_IMAGE: osrf/ubuntu_arm64:trusty
3131
- DOCKER_IMAGE: osrf/ubuntu_arm64:xenial
32-
- QEMU: aarach64
32+
- QEMU: aarch64
3333
DOCKER_IMAGE: arm64v8/ubuntu:bionic
34-
- QEMU: aarach64
34+
- QEMU: aarch64
3535
DOCKER_IMAGE: arm64v8/ubuntu:focal
3636
- DOCKER_IMAGE: osrf/debian_arm64:stretch
3737
- DOCKER_IMAGE: amd64/debian:unstable
@@ -64,7 +64,7 @@ jobs:
6464
# sparc64
6565
fail-fast: false
6666

67-
runs-on: ubuntu-latest
67+
runs-on: ubuntu-18.04
6868
timeout-minutes: 60
6969

7070
name: linux

.travis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
6767
fi
6868

6969
### for multiarch compile test
70-
if [ "$QEMU" != "" ]; then
70+
if [[ "$QEMU" != "" && "$DOCKER_IMAGE" != "arm64v8/ubuntu:"* ]]; then
7171
travis_time_start install.dpkg-dev
7272
apt-get install -qq -y dpkg-dev patchutils
7373
travis_time_end

0 commit comments

Comments
 (0)