From 8493e4951fb0f36628b5cc14150b7aa9034b435a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 16 Sep 2016 20:21:24 +0200 Subject: [PATCH] Do not run the upgrade on Travis for Fedora as it times out --- .travis.yml | 2 +- fedora/configure_fresh_system | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd077d75..c8f17114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: - ./test env: - - DETECTED_OS=fedora:24 + - DETECTED_OS=fedora:24 NOUPGRADE=true - DETECTED_OS=debian:jessie NOUPGRADE=true - DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:xenial diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 3ffefb16..97627540 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -3,7 +3,9 @@ set -e #software and shell -sudo dnf -y upgrade --best --allowerasing +if [[ -z $NOUPGRADE ]]; then + sudo dnf -y upgrade --best --allowerasing +fi sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm