From c9b95b7f4ced2d2ea1db436e172ac4a1fd04e1fc Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 27 Mar 2023 20:41:43 +0300 Subject: Revert "Travis CI: Change to Ubuntu Jammy for distcheck" This reverts commit b4624c1b196616bb059451448b2593686dabc0b9. The reason is that travis deployment script is not yet ported to Jammy. --- .travis.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60690a4..032252f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -622,9 +622,11 @@ jobs: - CROSS_GCC_VER=4.6.2 - NOLIBC_ARCH_ABI=tilegx-linux - NOLIBC_DELIM=_ - - dist: jammy + - dist: focal env: - MAKEFILE_TARGET=distcheck + - AUTOMAKE_VER=1.16.5 + - LIBTOOL_VER=2.4.6 before_install: - if [[ "$CROSS_GCC_VER" != "" ]]; then @@ -638,10 +640,31 @@ before_install: export C_INCLUDE_PATH=/usr/include; MAKEFILE_TARGET=check-nolink; fi +- if [[ "$AUTOMAKE_VER" != "" || "$LIBTOOL_VER" != "" || "$M4_VER" != "" ]]; then + GNUTOOLS_ROOT=`pwd`/../gnu-tools; + export PATH=$GNUTOOLS_ROOT/bin:$PATH; + GNU_DOWNLOAD_SITE=https://ftp.gnu.org/gnu; + fi +- if [[ "$M4_VER" != "" ]]; then + M4_XZ_URL=$GNU_DOWNLOAD_SITE/m4/m4-$M4_VER.tar.xz; + wget -O - $M4_XZ_URL | tar xf - --xz --directory ~; + (cd ~/m4-$M4_VER && ./configure --prefix=$GNUTOOLS_ROOT && make -j check && make install); + fi +- if [[ "$LIBTOOL_VER" != "" ]]; then + LIBTOOL_XZ_URL=$GNU_DOWNLOAD_SITE/libtool/libtool-$LIBTOOL_VER.tar.xz; + wget -O - $LIBTOOL_XZ_URL | tar xf - --xz --directory ~; + (cd ~/libtool-$LIBTOOL_VER && ./configure --prefix=$GNUTOOLS_ROOT && make -j && make install); + fi +- if [[ "$AUTOMAKE_VER" != "" ]]; then + AUTOMAKE_XZ_URL=$GNU_DOWNLOAD_SITE/automake/automake-$AUTOMAKE_VER.tar.xz; + wget -O - $AUTOMAKE_XZ_URL | tar xf - --xz --directory ~; + (cd ~/automake-$AUTOMAKE_VER && ./configure --prefix=$GNUTOOLS_ROOT && make -j && make install); + fi - if [[ "$MAKEFILE_TARGET" == "dist"* ]]; then autoconf --version; automake --version; m4 --version; + libtool --version || true; fi - if [[ "$CMAKE_OPTIONS" != "" ]]; then cmake --version; -- cgit v1.2.1