Adapt CI scripts to work under swift docker image

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2021ed1e6a702dab416acd1d5cee4bb93701a318..7fbae3fa7968768f86cbc1814308044bebf670c0 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `lyricli_command` specifies the flags
 
 ### Changed
+- CI scripts updated for gitlab CI instead of Travis
 - Flags are now single words
 - Update to Swift 5 tools
 - Replace CommandLineKit with Bariloche

diff --git a/Scripts/install_sourcekitten.sh b/Scripts/install_sourcekitten.sh
index 9420a26a78c94dd0cfb1b7502e3debfbbb6dbf72..f94fb53da150d4abd91d5d1da0a5a54c2cc32a73 100755 (executable)
--- a/Scripts/install_sourcekitten.sh
+++ b/Scripts/install_sourcekitten.sh
@@ -1,25 +1,10 @@
 #!/bin/bash
 
-# Taken from: https://alexplescan.com/posts/2016/03/03/setting-up-swiftlint-on-travis-ci/
-# And adapted for sourcekitten
-
-# Installs the SourceKitten package.
-# Tries to get the precompiled .pkg file from Github, but if that
-# fails just recompiles from source.
+# Installs SourceKitten from source (Intended to be used with
+# swift docker image)
 
 set -e
 
-SOURCEKITTEN_PKG_PATH="/tmp/SourceKitten.pkg"
-SOURCEKITTEN_PKG_URL="https://github.com/jpsim/SourceKitten/releases/download/0.17.3/SourceKitten.pkg"
-
-wget --output-document=$SOURCEKITTEN_PKG_PATH $SOURCEKITTEN_PKG_URL
-
-if [ -f $SOURCEKITTEN_PKG_PATH ]; then
-  echo "SourceKitten package exists! Installing it..."
-  sudo installer -pkg $SOURCEKITTEN_PKG_PATH -target /
-else
-  echo "SourceKitten package doesn't exist. Compiling from source..." &&
-  git clone https://github.com/jspim/SourceKitten.git /tmp/SourceKitten &&
-  cd /tmp/SourceKitten &&
-  sudo make install
-fi
+git clone https://github.com/jpsim/SourceKitten.git /tmp/SourceKitten &&
+cd /tmp/SourceKitten &&
+make install

diff --git a/Scripts/install_swiftlint.sh b/Scripts/install_swiftlint.sh
index 6a2f250f8ba5c2e2d3ed5e5ce180baed313c5732..4b8299d437cc18e8a02b56405506d3b02f48025f 100755 (executable)
--- a/Scripts/install_swiftlint.sh
+++ b/Scripts/install_swiftlint.sh
@@ -1,25 +1,11 @@
 #!/bin/bash
 
-# Taken from: https://alexplescan.com/posts/2016/03/03/setting-up-swiftlint-on-travis-ci/
-
-# Installs the SwiftLint package.
-# Tries to get the precompiled .pkg file from Github, but if that
-# fails just recompiles from source.
+# Installs SwiftLint from source (Intended to be used with
+# swift docker image)
 
 set -e
 
-SWIFTLINT_PKG_PATH="/tmp/SwiftLint.pkg"
-SWIFTLINT_PKG_URL="https://github.com/realm/SwiftLint/releases/download/0.18.1/SwiftLint.pkg"
-
-wget --output-document=$SWIFTLINT_PKG_PATH $SWIFTLINT_PKG_URL
-
-if [ -f $SWIFTLINT_PKG_PATH ]; then
-  echo "SwiftLint package exists! Installing it..."
-  sudo installer -pkg $SWIFTLINT_PKG_PATH -target /
-else
-  echo "SwiftLint package doesn't exist. Compiling from source..." &&
-  git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint &&
-  cd /tmp/SwiftLint &&
-  git submodule update --init --recursive &&
-  sudo make install
-fi
+git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint &&
+cd /tmp/SwiftLint &&
+git submodule update --init --recursive &&
+make install