Skip to content

Commit c9b95b7

Browse files
committed
Revert "Travis CI: Change to Ubuntu Jammy for distcheck"
This reverts commit b4624c1. The reason is that travis deployment script is not yet ported to Jammy.
1 parent 8555807 commit c9b95b7

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

.travis.yml

+24-1
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,11 @@ jobs:
622622
- CROSS_GCC_VER=4.6.2
623623
- NOLIBC_ARCH_ABI=tilegx-linux
624624
- NOLIBC_DELIM=_
625-
- dist: jammy
625+
- dist: focal
626626
env:
627627
- MAKEFILE_TARGET=distcheck
628+
- AUTOMAKE_VER=1.16.5
629+
- LIBTOOL_VER=2.4.6
628630

629631
before_install:
630632
- if [[ "$CROSS_GCC_VER" != "" ]]; then
@@ -638,10 +640,31 @@ before_install:
638640
export C_INCLUDE_PATH=/usr/include;
639641
MAKEFILE_TARGET=check-nolink;
640642
fi
643+
- if [[ "$AUTOMAKE_VER" != "" || "$LIBTOOL_VER" != "" || "$M4_VER" != "" ]]; then
644+
GNUTOOLS_ROOT=`pwd`/../gnu-tools;
645+
export PATH=$GNUTOOLS_ROOT/bin:$PATH;
646+
GNU_DOWNLOAD_SITE=https://ftp.gnu.org/gnu;
647+
fi
648+
- if [[ "$M4_VER" != "" ]]; then
649+
M4_XZ_URL=$GNU_DOWNLOAD_SITE/m4/m4-$M4_VER.tar.xz;
650+
wget -O - $M4_XZ_URL | tar xf - --xz --directory ~;
651+
(cd ~/m4-$M4_VER && ./configure --prefix=$GNUTOOLS_ROOT && make -j check && make install);
652+
fi
653+
- if [[ "$LIBTOOL_VER" != "" ]]; then
654+
LIBTOOL_XZ_URL=$GNU_DOWNLOAD_SITE/libtool/libtool-$LIBTOOL_VER.tar.xz;
655+
wget -O - $LIBTOOL_XZ_URL | tar xf - --xz --directory ~;
656+
(cd ~/libtool-$LIBTOOL_VER && ./configure --prefix=$GNUTOOLS_ROOT && make -j && make install);
657+
fi
658+
- if [[ "$AUTOMAKE_VER" != "" ]]; then
659+
AUTOMAKE_XZ_URL=$GNU_DOWNLOAD_SITE/automake/automake-$AUTOMAKE_VER.tar.xz;
660+
wget -O - $AUTOMAKE_XZ_URL | tar xf - --xz --directory ~;
661+
(cd ~/automake-$AUTOMAKE_VER && ./configure --prefix=$GNUTOOLS_ROOT && make -j && make install);
662+
fi
641663
- if [[ "$MAKEFILE_TARGET" == "dist"* ]]; then
642664
autoconf --version;
643665
automake --version;
644666
m4 --version;
667+
libtool --version || true;
645668
fi
646669
- if [[ "$CMAKE_OPTIONS" != "" ]]; then
647670
cmake --version;

0 commit comments

Comments
 (0)