aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Barnett <noreply@jamesbarnett.xyz>2018-02-27 21:10:23 +0000
committerJames Barnett <noreply@jamesbarnett.xyz>2018-02-27 21:10:23 +0000
commitbd0646fcce28ed7d19884ddd64a096b1c4a8a9cc (patch)
tree91ac830cf3b68ef428f8524170cf6cdad39903fd
parent96f7fafe13543bbf1cb90d063391f75ad564bd1e (diff)
downloadsql-plus-plus-bd0646fcce28ed7d19884ddd64a096b1c4a8a9cc.tar.xz
sql-plus-plus-bd0646fcce28ed7d19884ddd64a096b1c4a8a9cc.zip
Remove git-lfs from travis build script
Simplify travis.yml and package.json. Remove git-lfs, and redundant yarn call.
-rw-r--r--.travis.yml9
-rw-r--r--package.json3
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",