From bf5f7d699e4633329e5fcaef241c457dce898d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 14:32:53 +0200 Subject: [PATCH 1/9] enabled docker tests for fedora on travis --- .travis.yml | 4 +++- fedora/test_insider | 16 ++++++++++++++++ fedora/test_outsider | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 fedora/test_insider create mode 100755 fedora/test_outsider diff --git a/.travis.yml b/.travis.yml index 5dc1e9ae..020afeb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: bash -script: ./bunsen/test_outsider +script: + ./fedora/test_outsider + ./bunsen/test_outsider sudo: required diff --git a/fedora/test_insider b/fedora/test_insider new file mode 100755 index 00000000..496329b8 --- /dev/null +++ b/fedora/test_insider @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +export DONT_CHANGE_SHELL=true +export DONT_START_TOR=true + +dnf -y install sudo + +cd $HOME + +mkdir -p dev/ +cp -rv temp/dotfiles dev/ + +./dev/dotfiles/fedora/configure_fresh_system + diff --git a/fedora/test_outsider b/fedora/test_outsider new file mode 100755 index 00000000..0f43e663 --- /dev/null +++ b/fedora/test_outsider @@ -0,0 +1,3 @@ +#!/bin/bash + +docker run -v `pwd`:/root/temp/dotfiles/ fedora:24 /root/temp/dotfiles/fedora/test_insider From 08bde6d72410fdf16ef9e591b887be362f56d554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 14:38:46 +0200 Subject: [PATCH 2/9] install git explicitely for fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 560059f9..94fe4760 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -2,7 +2,7 @@ #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-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 +sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-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 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 From 3053b442c33a8a64b9b940ffb59af4edfd17197a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 14:58:43 +0200 Subject: [PATCH 3/9] make working on fedora 24 --- fedora/configure_fresh_system | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 94fe4760..2fe5d9e5 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -1,8 +1,10 @@ #!/bin/bash +set -e + #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-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 +sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-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 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 From 03fcabd6285d3c33257108746cad152bc8968ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 15:14:40 +0200 Subject: [PATCH 4/9] make fedora installer understand DONT_START_TOR --- fedora/configure_fresh_system | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 2fe5d9e5..529b79fc 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -11,8 +11,10 @@ sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonf sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang sudo dnf -y groupinstall "C Development Tools and Libraries" -sudo systemctl enable tor -sudo systemctl start tor +if [[ -z $DONT_START_TOR ]]; then + sudo systemctl enable tor + sudo systemctl start tor +fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" From 044b4bdd49968282730d5390737ce2cd91149899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 15:38:55 +0200 Subject: [PATCH 5/9] explicitely install xz on fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 529b79fc..9b7f9ecd 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ set -e #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-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 +sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-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 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 From 2b5e4d530b3f02f511161f27625346c9779d9aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 17:03:00 +0200 Subject: [PATCH 6/9] try to test both fedora and bunsen --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 020afeb6..c90fa488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: bash script: - ./fedora/test_outsider - ./bunsen/test_outsider + - ./fedora/test_outsider + - ./bunsen/test_outsider sudo: required From a6aaed62f290075b3c6f583327d4d7e913d0970d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 21:39:51 +0200 Subject: [PATCH 7/9] chsh installed explicitely on fedora --- common/configure_fresh_system | 9 --------- fedora/configure_fresh_system | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 9b7f0007..d949971a 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -96,15 +96,6 @@ set -e cargo install rustfmt cargo install racer -# rvm -gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -$CURL -L https://get.rvm.io | bash -s stable -set +e -source /etc/profile.d/rvm.sh -source $HOME/.rvm/scripts/rvm -set -e -rvm install ruby - # go export GOPATH="$HOME/go" mkdir -p "$GOPATH" diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 9b7f9ecd..fed9f69b 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ set -e #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-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 +sudo dnf -y --best --allowerasing install vim 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 tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-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 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 From ba2b1d8db27ee9c7fd8d7538de89bcfd5d5157a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 22:52:19 +0200 Subject: [PATCH 8/9] try launching fedora and bunsen builds as separate travis jobs --- .travis.yml | 7 +++++-- test | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100755 test diff --git a/.travis.yml b/.travis.yml index c90fa488..52b392a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: bash script: - - ./fedora/test_outsider - - ./bunsen/test_outsider + - ./test + +env: + - DETECTED_OS=fedora + - DETECTED_OS=bunsen sudo: required diff --git a/test b/test new file mode 100755 index 00000000..5455762a --- /dev/null +++ b/test @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ -z $DETECTED_OS ]]; then + echo "cannot detect OS, please set DETECTED_OS manually" + exit 1 +fi + +./$DETECTED_OS/configure_fresh_system + From 6d264f77c35446b785f1c57006efd7149b6316ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 22:55:05 +0200 Subject: [PATCH 9/9] corrected path to dockerized tests in travis --- .travis.yml | 3 ++- test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52b392a2..82c8aa76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -language: bash +language: + - bash script: - ./test diff --git a/test b/test index 5455762a..24ad174e 100755 --- a/test +++ b/test @@ -5,5 +5,5 @@ if [[ -z $DETECTED_OS ]]; then exit 1 fi -./$DETECTED_OS/configure_fresh_system +./$DETECTED_OS/test_outsider