From f43cbaf08072763aa3abd11736cfc77cd9457637 Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Mon, 13 May 2019 21:54:42 +0200
Subject: Use single word long options

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 5e7c995..5614f5d 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ song and artist names before the lyrics.
 
 In order to configure
 
-* `lrc -l` or `lrc --list-sources` lists the available sources. Enabled
+* `lrc -l` or `lrc --list` lists the available sources. Enabled
   sourcess will have a `*`
 * `lrc -e` or `lrc --enable <source>` enables a source
 * `lrc -d` or `lrc --disable <source>` disables a source
-* `lrc -r` or `lrc --reset-source <source>` resets the configuration for
+* `lrc -r` or `lrc --reset <source>` resets the configuration for
   a source and disables it.
 * `lrc -v` or `lrc --version` prints the version
 * `lrc -h` or `lrc --help` display built-in help
-- 
cgit 


From 1a8c14fd7973468379f8926069b4b0698d9c4ac8 Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Mon, 13 May 2019 21:55:47 +0200
Subject: Update swift version in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 5614f5d..0ee2657 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ In order to configure
 
 ## Building
 
-The build has only been tested on OSX using Swift 3.1. Building defaults
+The build has only been tested on OSX using Swift 5.0.1. Building defaults
 to the debug configuration.
 
 ```
-- 
cgit 


From 3f746cc0beb5756e706e289ab2b92b43de928f74 Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Mon, 13 May 2019 22:03:51 +0200
Subject: Remove travis config, add gitlab CI

---
 .gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 .travis.yml    | 28 ----------------------------
 README.md      |  2 --
 3 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100644 .gitlab-ci.yml
 delete mode 100644 .travis.yml

(limited to 'README.md')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..e55b711
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,43 @@
+image: swift:5.0.1
+
+stages:
+  - lint
+  - build
+  - document
+  - deploy
+
+cache:
+  key: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}
+  paths:
+    - .build/
+
+before_script:
+  - gem install jazzy
+  - "./Scripts/install_sourcekitten.sh"
+  - "./Scripts/install_swiftlint.sh"
+
+lint:
+  stage: lint
+  script:
+    - make lint
+
+build:
+  stage: build
+  script:
+    - make build
+
+document:
+  stage: document
+  script:
+    - make document
+  artifacts:
+    paths:
+      - docs
+
+pages:
+  stage: deploy
+  script:
+    - mv docs public
+  artifacts:
+    paths:
+      - public
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 46250e5..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-language:
-  - swift
-
-osx_image: xcode8.3
-
-install:
-  - gem install jazzy
-  - "./Scripts/install_sourcekitten.sh"
-  - "./Scripts/install_swiftlint.sh"
-
-script:
-  - make lint
-  - make build
-
-before_deploy:
-  - make document
-
-deploy:
-  provider: pages
-  skip_cleanup: true
-  github_token: "$GITHUB_TOKEN"
-  local_dir: docs
-  on:
-    branch: master
-
-env:
-  global:
-    secure: EyOzJFSGY2ifBVqnQz7Xc0sDcg9maLb7VDKWIC2+1n2RsMHGptsxDfJf9r/bOc2kJN9mCzw19eA3XTkypeHKgIgPZ+boLPTDqiiNcD+0iVkYxqw/Q0v5et1+pJaOUo93cKfl2WLWXvISU1MYuzbjGwmnjPDUmujTwGZH1SFvhOKynqx9V/PiL4ZF+CurU2far+diLDhJXUPT4mDV6lDfiALUBvfj50AplM928Vwc6xr71SFii4fE+1GGGGI23ZyXmhnYIJBfQ/9d2wzW6szSRz+q0Gq8jQFJ2cZmBQPnfPY6/xARkDIf5H55HIxLg8pqA7Yn+WDT6/a8uoFLY6OzI8B/TTZ/pX4LXhkK0gbmXeeigRjxN3Dcsb++n9e5+3/Bq0y/Vm+Ufy+TtEvExvU6vdzDu8YZQaE0T2Loyqaw3BQBMoCunv4i7z0crXTLyNYNuc3zDGDmjkR3laxX8lcEZ85zTRTuYqxmvQxkxWUHKYQOvGy7SfkD1xc73f1XvCqpx45utZX0U/OzIxRflWFNy4mlgLvo23h5T0b44LGBBBWEVkjt5YduOuSo9L1wtOrADcDYyxSciIby2SHd4B2fGOb059KyCIUcX/qgOS6FJlmPeC963NCAuZB6DyscaoT6DrJto9nuZW2wNYdo7dvCC2E4ZqHnRPl2zux/RTmeuCU=
diff --git a/README.md b/README.md
index 0ee2657..57dff9a 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,6 @@ tests.
 make test
 ```
 
-[![Build Status](https://travis-ci.org/lyricli-app/lyricli.svg?branch=master)](https://travis-ci.org/lyricli-app/lyricli)
-
 [swiftlint]: https://github.com/realm/SwiftLint
 [jazzy]: https://github.com/realm/jazzy
 [sourcekitten]: https://github.com/jpsim/SourceKitten
-- 
cgit