From bd0646fcce28ed7d19884ddd64a096b1c4a8a9cc Mon Sep 17 00:00:00 2001
From: James Barnett <noreply@jamesbarnett.xyz>
Date: Tue, 27 Feb 2018 21:10:23 +0000
Subject: Remove git-lfs from travis build script

Simplify travis.yml and package.json. Remove git-lfs, and redundant yarn call.
---
 .travis.yml  | 9 ++++-----
 package.json | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea7dd2a..1b09c56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,16 +23,15 @@ cache:
   - $HOME/.npm/_prebuilds
 
 before_install:
-  - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.2.0/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.2.0.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
-  - curl -L https://yarnpkg.com/latest.tar.gz | tar xvz --strip-components 1 && mv bin $HOME/.yarn
-  - export PATH="$HOME/.yarn:$PATH"
+  - curl -L https://yarnpkg.com/latest.tar.gz | tar xvz -C $HOME/.yarn --strip-components 1
+  - export PATH="$HOME/.yarn/bin:$PATH"
 
 install:
   - yarn
 
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then yarn travis-dist; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn travis-dist -- --mac --win; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then yarn dist; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn dist -- --mac --win; fi
 
 before_cache:
   - rm -rf $HOME/.cache/electron-builder/wine
diff --git a/package.json b/package.json
index c1706d0..9d0cac1 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,7 @@
   "scripts": {
     "start": "electron .",
     "pack": "electron-builder --dir",
-    "dist": "electron-builder",
-    "travis-dist": "yarn && electron-builder"
+    "dist": "electron-builder"
   },
   "author": {
     "name": "James Barnett",
-- 
cgit v1.2.3