Merge remote-tracking branch 'upstream/master' into fix-travis

.gitignore

@@ -17,4 +17,5 @@ airtime_mvc/tests/log/*.log
 .DS_Store
 .idea/
 /docs/_site/*
-/docs/.jekyll-cache/*
+/docs/.jekyll-cache/*
+/docs/.gems/*

.travis.yml

@@ -1,4 +1,4 @@
-dist: bionic
+dist: xenial
 
 services:
   - postgresql
@@ -23,10 +23,6 @@ addons:
       - liquidsoap-plugin-vorbis
       - python3-gst-1.0
       - silan
-      - python3-gi
-      - python3-gi-cairo
-      - gcc
-      - gir1.2-gtk-3.0
 
 jobs:
   include:

Vagrantfile

@@ -67,9 +67,6 @@ Vagrant.configure("2") do |config|
 
     # Provision LibreTime
     config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args
-
-    # Provision docs
-    config.vm.provision "build-site-jekyll", type: "shell", path: "docs/jekyll.sh"
   end
 
 end

docs/_config.yml

@@ -10,8 +10,6 @@ includes_dir: _includes
 
 favicon: favicon.ico
 
-exclude: ['jekyll.sh'
-]
 # For splash page layout only
 headimage: img/header.jpg
 headtext: Open Source Radio Automation

docs/jekyll.sh

@@ -1,18 +0,0 @@
-# Installing Jekyll
-# This script does not work and exists as a skeleton for
-# someone to use to get Jekyll building outside of GitHub
-
-echo "Installing Ruby"
-sudo apt-get install ruby-full build-essential zlib1g-dev
-
-export GEM_HOME=".gems"
-export PATH=".gems/bin:$PATH"
-
-echo "Installing Jekyll"
-cd docs
-gem install jekyll bundler
-
-# Running Jekyll
-bundle exec jekyll serve --watch --port 8888
-
-echo "Visit http://localhost:8888 to see the LibreTime website."

jekyll.sh

@@ -0,0 +1,15 @@
+#/bin/bash
+
+echo "Installing Ruby"
+apt-get update -y && apt-get install -y ruby-full build-essential zlib1g-dev
+
+export GEM_HOME=".gems"
+export PATH=".gems/bin:$PATH"
+
+echo "Installing Jekyll"
+
+cd docs
+gem install jekyll bundler
+
+# Running Jekyll
+jekyll serve