From a7ad8bf45e32f452a57a8bf2a1f941ff42277af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 7 Oct 2016 10:01:17 +0200 Subject: [PATCH 1/5] Do not reinstall rust tools if present --- common/configure_fresh_system | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 86bbb68f..9969c1d3 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -98,10 +98,12 @@ if [[ -z $NORUST ]]; then git pull git submodule update --init --recursive fi - cargo install -j $jobs_count -f rustfmt - cargo install -j $jobs_count -f racer - cargo install -j $jobs_count -f rustsym - cargo install -j $jobs_count -f ripgrep +set +e + cargo install rustfmt + cargo install racer + cargo install rustsym + cargo install ripgrep +set -e fi if [[ -z $NORUBY ]]; then From fe2704d754954c25b4803b194fdd9a562d0fd49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 7 Oct 2016 10:01:26 +0200 Subject: [PATCH 2/5] Kdiff update --- .kdiff3rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kdiff3rc b/.kdiff3rc index 771a735a..dc44fc6b 100644 --- a/.kdiff3rc +++ b/.kdiff3rc @@ -98,7 +98,7 @@ Height 768=769 Height 900=901 Height 975=976 Height 985=986 -State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA +State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA ToolBarsMovable=Disabled Width 1366=1367 Width 1440=1441 From 775146085a2765f25d13dbad7b8c3578c8f40e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 7 Oct 2016 11:01:59 +0200 Subject: [PATCH 3/5] Use base docker images for all builds --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b008b70..0160c98b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ script: - ./test env: - - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base + - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base - - DETECTED_OS=ubuntu:trusty - - DETECTED_OS=ubuntu:xenial + - DETECTED_OS=ubuntu:trusty DOCKER_IMAGE=cyplo/trusty_base + - DETECTED_OS=ubuntu:xenial DOCKER_IMAGE=cyplo/xenial_base sudo: required From d503f11d47743189cff52887da3b1fc385ee07de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 8 Oct 2016 08:08:17 +0200 Subject: [PATCH 4/5] Do not use RPMFusion --- fedora/configure_fresh_system | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index bd1701d6..fdfa42d4 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -5,11 +5,9 @@ set -e 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 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 zeal -FEDORA_VERSION=`rpm -E %fedora` -sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm -sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm -sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp mono-devel keepass mplayer golang ncurses-compat-libs kicad retext + +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 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 zeal archivemount keepass splix gutenprint-cups cups-bjnp + sudo dnf -y groupinstall "C Development Tools and Libraries" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" From 8703f9024a90f5376c8b648c08f6e492df4f07fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 8 Oct 2016 08:21:07 +0200 Subject: [PATCH 5/5] Install development tools explicitly --- fedora/configure_fresh_system | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index fdfa42d4..00d829ea 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -9,6 +9,7 @@ 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 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 zeal archivemount keepass splix gutenprint-cups cups-bjnp sudo dnf -y groupinstall "C Development Tools and Libraries" +sudo dnf -y groupinstall "Development Tools" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"