remove arm64v8 test from linux, run with linux-arm target

euslisp · Feb 6, 2025 · 6bc718f · 6bc718f
1 parent cbd4a5d
commit 6bc718f
Showing 1 changed file with 42 additions and 9 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -27,19 +27,10 @@ jobs:
             ROS_DISTRO: noetic
           - DOCKER_IMAGE: osrf/ubuntu_armhf:trusty
           - DOCKER_IMAGE: osrf/ubuntu_armhf:xenial
-          # - DOCKER_IMAGE: osrf/ubuntu_arm64:trusty  # deprecated
-          - DOCKER_IMAGE: osrf/ubuntu_arm64:xenial
-          - QEMU: aarch64
-            DOCKER_IMAGE: arm64v8/ubuntu:bionic
-          - QEMU: aarch64
-            DOCKER_IMAGE: arm64v8/ubuntu:focal
-          - DOCKER_IMAGE: osrf/debian_arm64:stretch
           - DOCKER_IMAGE: amd64/debian:unstable
             #
           - QEMU: amd64
             DOCKER_IMAGE: amd64/debian:unstable # amd64
-          - QEMU: aarch64
-            DOCKER_IMAGE: arm64v8/debian:buster # arm64
           - QEMU: arm
             DOCKER_IMAGE: arm32v5/debian:jessie # armel
           - QEMU: arm
@@ -94,6 +85,48 @@ jobs:
           echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME on $QEMU_VOLUME"
           docker run $PLATFORM_OPTION --rm $QEMU_VOLUME -v $HOME:$HOME -e "QEMU=$QEMU" -e "TRAVIS_OS_NAME=$TRAVIS_OS_NAME" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -e "MAKEFLAGS=$MAKEFLAGS" -e "DOCKER_IMAGE=$DOCKER_IMAGE" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
 
+  linux-arm:
+    strategy:
+      matrix:
+        include:
+          - DOCKER_IMAGE: arm64v8/ubuntu:trusty
+          - DOCKER_IMAGE: arm64v8/ubuntu:xenial
+          - DOCKER_IMAGE: arm64v8/ubuntu:bionic
+          - DOCKER_IMAGE: arm64v8/ubuntu:focal
+          - DOCKER_IMAGE: arm64v8/ubuntu:jammy
+          - DOCKER_IMAGE: arm64v8/ubuntu:noble
+          - DOCKER_IMAGE: arm64v8/debian:stretch
+          - DOCKER_IMAGE: arm64v8/debian:buster
+          - DOCKER_IMAGE: arm64v8/debian:bullseye
+          - DOCKER_IMAGE: arm64v8/debian:bookworm
+          - DOCKER_IMAGE: arm64v8/debian:trixie
+          - DOCKER_IMAGE: arm64v8/debian:sid
+      fail-fast: false
+
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 60
+
+    name: linux-arm
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run test
+        shell: bash
+        run: |
+          set -x
+          export CI_SOURCE_PATH=$(pwd)
+          export REPOSITORY_NAME=${PWD##*/}
+          export TRAVIS_BRANCH=${GITHUB_REF#refs/heads/}
+          export TRAVIS_OS_NAME=linux
+          export DOCKER_IMAGE=${{matrix.DOCKER_IMAGE}}
+          export ROS_DISTRO=${{matrix.ROS_DISTRO}}
+          export QEMU=${{matrix.QEMU}}
+          export MAKEFLAGS="-j4"
+          git clone http://github.com/euslisp/jskeus ${HOME}/jskeus
+          echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME on $QEMU_VOLUME"
+          docker run --rm $QEMU_VOLUME -v $HOME:$HOME -e "TRAVIS_OS_NAME=$TRAVIS_OS_NAME" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -e "MAKEFLAGS=$MAKEFLAGS" -e "DOCKER_IMAGE=$DOCKER_IMAGE" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
+
   debian-unstable:
     strategy:
       matrix: