From c7a01d66b43fbb60b4414b87b3955ff720d3c3f0 Mon Sep 17 00:00:00 2001 From: edoapra Date: Fri, 13 Jan 2023 09:35:24 -0800 Subject: [PATCH] more pkgs in retry loop --- travis/build_env.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/travis/build_env.sh b/travis/build_env.sh index f4d1c0e6eb..ec15083ba6 100755 --- a/travis/build_env.sh +++ b/travis/build_env.sh @@ -143,18 +143,19 @@ if [[ "$os" == "Linux" ]]; then sudo apt-get update sudo apt-get -y install software-properties-common sudo add-apt-repository universe && sudo apt-get update + pkg_extra=" " + if [[ "$FC" == "gfortran-11" ]] || [[ "$CC" == "gcc-11" ]]; then + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + pkg_extra+=" gcc-11 gfortran-11 g++-11 " + fi + if [[ "$USE_LIBXC" == "-1" ]]; then + pkg_extra+=" libxc-dev " + fi tries=0 ; until [ "$tries" -ge 10 ] ; do \ - sudo apt-get -y install gfortran python3-dev make perl python3 rsync "$mpi_libdev" "$mpi_bin" \ + sudo apt-get -y install gfortran python3-dev make perl python3 rsync "$mpi_libdev" "$mpi_bin" "$pkg_extra" \ && break ;\ tries=$((tries+1)) ; echo attempt no. $tries ; sleep 30 ; done - if [[ "$FC" == "gfortran-11" ]] || [[ "$CC" == "gcc-11" ]]; then - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get -y install gcc-11 gfortran-11 g++-11 - fi - fi - if [[ "$USE_LIBXC" == "-1" ]]; then - sudo apt-get -y install libxc-dev fi if [[ "$FC" == "ifort" ]] || [[ "$FC" == "ifx" ]]; then sh ./"$base".sh -a -c -s --action remove --install-dir $IONEAPI_ROOT --eula accept