Skip to content

Commit 8f6bcba

Browse files
authored
Merge pull request #642 from k-okada/fix-ci
fix CI
2 parents 69be3cf + e62190a commit 8f6bcba

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

.github/workflows/config.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- DOCKER_IMAGE: debian:stretch
2424
- DOCKER_IMAGE: osrf/ubuntu_armhf:trusty
2525
- DOCKER_IMAGE: osrf/ubuntu_armhf:xenial
26-
- DOCKER_IMAGE: osrf/ubuntu_arm64:trusty
26+
# - DOCKER_IMAGE: osrf/ubuntu_arm64:trusty # deprecated
2727
- DOCKER_IMAGE: osrf/ubuntu_arm64:xenial
2828
- DOCKER_IMAGE: arm64v8/ubuntu:bionic
2929
- DOCKER_IMAGE: arm64v8/ubuntu:focal
@@ -48,16 +48,28 @@ jobs:
4848
export TRAVIS_OS_NAME=linux
4949
export DOCKER_IMAGE=${{matrix.DOCKER_IMAGE}}
5050
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt-get install -y -qq qemu-user-static git; fi
51-
if [[ "$DOCKER_IMAGE" == *"arm64v8"* ]]; then export QEMU_VOLUME="-v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static"; fi #
51+
if [[ "$DOCKER_IMAGE" == *"arm64v8"* ]]; then export QEMU_VOLUME="-v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static"; export PLATFORM_OPTION="--platform linux/aarch64"; fi #
5252
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
53-
docker run --rm $QEMU_VOLUME -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "DOCKER_IMAGE=$DOCKER_IMAGE" -e "COLLISION_LIB=$COLLISION_LIB" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
53+
docker run $PLATFORM_OPTION --rm $QEMU_VOLUME -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "DOCKER_IMAGE=$DOCKER_IMAGE" -e "COLLISION_LIB=$COLLISION_LIB" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
5454
5555
catkin:
5656
runs-on: ubuntu-latest
57-
container: ubuntu:18.04
57+
container:
58+
image: ubuntu:18.04
59+
volumes:
60+
- /tmp/node20:/__e/node20
5861
timeout-minutes: 60
5962

6063
steps:
64+
- name: Try to replace `node` with an glibc 2.17
65+
shell: bash
66+
run: |
67+
ls -lar /__e/node20 &&
68+
apt update && apt-get install -y curl &&
69+
curl -Lo /tmp/node.tar.gz https://unofficial-builds.nodejs.org/download/release/v20.17.0/node-v20.17.0-linux-x64-glibc-217.tar.gz &&
70+
cd /__e/node20 &&
71+
tar -x --strip-components=1 -f /tmp/node.tar.gz &&
72+
ls -lar /__e/node20/bin/
6173
- name: Checkout
6274
uses: actions/checkout@v2
6375
- name: Setup Apt
@@ -141,7 +153,7 @@ jobs:
141153
142154
143155
osx:
144-
runs-on: macos-latest
156+
runs-on: macos-13 # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
145157
timeout-minutes: 60
146158
steps:
147159
- name: Checkout

0 commit comments

Comments
 (0)