Skip to content

Commit b012e8e

Browse files
committed
1 parent bbdff64 commit b012e8e

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.github/workflows/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
- DOCKER_IMAGE: debian:stretch
2424
- DOCKER_IMAGE: osrf/ubuntu_armhf:trusty
2525
- DOCKER_IMAGE: osrf/ubuntu_armhf:xenial
26+
- DOCKER_IMAGE: debian:sid
27+
- DOCKER_IMAGE: debian:sid
28+
USE_EXPERIMENTAL: TRUE
2629
fail-fast: false
2730

2831
runs-on: ubuntu-latest
@@ -42,10 +45,11 @@ jobs:
4245
export TRAVIS_BRANCH=${GITHUB_REF#refs/heads/}
4346
export TRAVIS_OS_NAME=linux
4447
export DOCKER_IMAGE=${{matrix.DOCKER_IMAGE}}
45-
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt-get install -y -qq qemu-user-static git; fi
48+
export USE_EXPERIMENTAL=${{matrix.USE_EXPERIMENTAL}}
49+
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt update -y -qq && sudo apt-get install -y -qq qemu-user-static git; fi
4650
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 #
4751
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
48-
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"
52+
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 "USE_EXPERIMENTAL=$USE_EXPERIMENTAL" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
4953
5054
linux-arm:
5155
strategy:

.travis.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function travis_time_end {
2222

2323
travis_time_start setup.apt-get_update
2424
# Use archive repository for Debian Stretch
25-
if [[ "$DOCKER_IMAGE" == *"stretch" ]]; then
25+
if [[ "$DOCKER_IMAGE" == *"stretch" || "$DOCKER_IMAGE" == *"buster" ]]; then
2626
sed -i 's/[[:alpha:]]*.debian.org/archive.debian.org/' /etc/apt/sources.list
2727
sed -i '/stretch-updates/ s/^#*/#/' /etc/apt/sources.list
2828
fi
@@ -36,6 +36,13 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
3636
#
3737
sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev # msttcorefonts could not install on 14.04 travis
3838
# sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils || echo "ok" # 16.04 does ont have ptex bin
39+
40+
# test with latest GCC's
41+
if [[ "$USE_EXPERIMENTAL" == "true" ]]; then
42+
echo 'deb http://deb.debian.org/debian experimental main' | sudo tee /etc/apt/sources.list.d/experimental.list
43+
apt update -qq -y
44+
apt-get -qq -y -t=experimental install gcc g++
45+
fi
3946
travis_time_end
4047

4148
if [[ "$COLLISION_LIB" != "" ]]; then

0 commit comments

Comments
 (0)