Skip to content

Commit

Permalink
Merge pull request euslisp#489 from k-okada/fix_ga
Browse files Browse the repository at this point in the history
set QEMU=aarch64 DOCEKR_IAMGE=arm64v8/ubuntu for not to skip jskeus test
  • Loading branch information
k-okada committed Apr 17, 2022
2 parents b55ce59 + cb43871 commit 0033f2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
# sparc64
fail-fast: false

runs-on: ubuntu-latest
runs-on: ubuntu-18.04
timeout-minutes: 60

name: linux
Expand Down
2 changes: 1 addition & 1 deletion .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0033f2e

Please sign in to comment.