Skip to content

Commit

Permalink
Merge branch 'master' into pr_fix_coordinates_doc
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada authored Jun 27, 2023
2 parents b80ed37 + 20ab5c2 commit 398ab65
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
# sparc64
fail-fast: false

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

name: linux
Expand All @@ -86,7 +86,7 @@ jobs:
export MAKEFLAGS="-j4"
if [[ "$QEMU" != "" || "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt-get update -y -qq; fi
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
if [[ "$QEMU" != "" ]]; then docker run --rm --privileged multiarch/qemu-user-static:register; fi
if [[ "$QEMU" != "" ]]; then docker run --rm --privileged multiarch/qemu-user-static:register --reset; fi
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then sudo apt-get install -y -qq qemu-user-static; fi
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then git clone http://github.com/euslisp/jskeus ${HOME}/jskeus; fi
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME on $QEMU_VOLUME"
Expand Down
16 changes: 13 additions & 3 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ function travis_time_end {
if [ "$TRAVIS_OS_NAME" == "linux" ]; then

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

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

travis_time_start setup.apt-get_install
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
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
# unset protocol version https://github.com/juju/charm-tools/issues/532
git config --global --unset protocol.version || echo "OK"
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
Expand All @@ -67,9 +74,9 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
fi

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

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

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

# TEST-NAME: test-copy-object-body : extending gcstack 0 -> Segfault
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
eusgl $test_l;
export TMP_EXIT_STATUS=$?
Expand Down

0 comments on commit 398ab65

Please sign in to comment.