Skip to content
This repository has been archived by the owner on May 15, 2021. It is now read-only.

Commit

Permalink
add PROD_URL fallback for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
nnsdev committed Jun 21, 2018
1 parent 58f1eed commit cee78c3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
17 changes: 3 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
osx_image: xcode8.3
sudo: required
dist: trusty
language: c
matrix:
include:
- os: osx
- os: linux
env: CC=clang CXX=clang++ npm_config_clang=1
compiler: clang
- os: windows
cache:
directories:
- node_modules
Expand All @@ -18,13 +12,8 @@ addons:
packages:
- libgnome-keyring-dev
- icnsutils
before_install:
- mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([
"$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz
| tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi
install:
- nvm install 7
- nvm install 9
- curl -o- -L https://yarnpkg.com/install.sh | bash
- source ~/.bashrc
- npm install -g xvfb-maybe
Expand All @@ -33,4 +22,4 @@ script:
- yarn run build
branches:
only:
- master
- master
3 changes: 3 additions & 0 deletions src/renderer/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ if (!process.env.IS_WEB) Vue.use(require('vue-electron'))
Vue.http = Vue.prototype.$http = axios
Vue.config.productionTip = false
Vue.prototype.$fs = require('fs-extra')
if (!process.env.PROD_URL) {
process.env.PROD_URL = 'https://dokdrop.whatan.app/api/'
}
Vue.prototype.$backend = (process.env.NODE_ENV === 'development') ? process.env.LOCAL_URL : process.env.PROD_URL
Vue.prototype.$axios = require('axios')

Expand Down

0 comments on commit cee78c3

Please sign in to comment.