Skip to content

Commit 398ab65

Browse files
authored
Merge branch 'master' into pr_fix_coordinates_doc
2 parents b80ed37 + 20ab5c2 commit 398ab65

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.github/workflows/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# sparc64
6565
fail-fast: false
6666

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

7070
name: linux
@@ -86,7 +86,7 @@ jobs:
8686
export MAKEFLAGS="-j4"
8787
if [[ "$QEMU" != "" || "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt-get update -y -qq; fi
8888
if [[ "$QEMU" != "" ]]; then sudo apt-get install -y -qq qemu-user-static; ls /usr/bin/qemu-*-static; export QEMU_VOLUME="-v /usr/bin/qemu-$QEMU-static:/usr/bin/qemu-$QEMU-static" ; fi
89-
if [[ "$QEMU" != "" ]]; then docker run --rm --privileged multiarch/qemu-user-static:register; fi
89+
if [[ "$QEMU" != "" ]]; then docker run --rm --privileged multiarch/qemu-user-static:register --reset; fi
9090
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt-get install -y -qq qemu-user-static; fi
9191
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then git clone http://github.com/euslisp/jskeus ${HOME}/jskeus; fi
9292
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME on $QEMU_VOLUME"

.travis.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ function travis_time_end {
3232
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
3333

3434
travis_time_start setup.apt-get_update
35+
if [[ "$DOCKER_IMAGE" == *"stretch" || "$DOCKER_IMAGE" == *"jessie" ]] ; then
36+
cat /etc/apt/sources.list
37+
sed -i [email protected]@archive.debian.org@ /etc/apt/sources.list;
38+
sed -i [email protected]@archive.debian.org@ /etc/apt/sources.list;
39+
sed -i [email protected]/[email protected]/debian-security@ /etc/apt/sources.list
40+
sed -i '/-updates/ s/^#*/#/' /etc/apt/sources.list
41+
fi
3542
if [ ! -e /usr/bin/sudo ] ; then apt-get update && apt-get install -y sudo; else sudo apt-get update; fi
3643
travis_time_end
3744

@@ -42,7 +49,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
4249
travis_time_end
4350

4451
travis_time_start setup.apt-get_install
45-
ret=1; while [ $ret != 0 ]; do 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 && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis
52+
ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y --force-yes 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 && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis
4653
# unset protocol version https://github.com/juju/charm-tools/issues/532
4754
git config --global --unset protocol.version || echo "OK"
4855
if [ "`uname -m`" == "x86_64" ] ; then sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils || echo "ok"; fi # 16.04 does ont have ptex bin
@@ -67,9 +74,9 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
6774
fi
6875

6976
### for multiarch compile test
70-
if [[ "$QEMU" != "" && "$DOCKER_IMAGE" != "arm64v8/ubuntu:"* ]]; then
77+
if [[ "$QEMU" != "" ]]; then
7178
travis_time_start install.dpkg-dev
72-
apt-get install -qq -y dpkg-dev patchutils
79+
apt-get install -qq -y --force-yes dpkg-dev patchutils
7380
travis_time_end
7481

7582
echo "uname -a : $(uname -a)"
@@ -121,6 +128,9 @@ if [[ "$QEMU" != "" && "$DOCKER_IMAGE" != "arm64v8/ubuntu:"* ]]; then
121128

122129
sed -i 's/\(i-max\ [0-9]000\)0*/\1/' $test_l
123130

131+
# TEST-NAME: test-copy-object-body : extending gcstack 0 -> Segfault
132+
if [[ (( "$DOCKER_IMAGE" == "arm64v8/debian:buster" || "$DOCKER_IMAGE" == "arm64v8/ubuntu:focal" ) && $test_l =~ object.l ) ]]; then sed -i 's/dotimes (i 1000)/dotimes (i 10)/' $test_l; fi
133+
124134
eusgl $test_l;
125135
export TMP_EXIT_STATUS=$?
126136

0 commit comments

Comments
 (0)