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

Commit cee78c3

Browse files
committed
add PROD_URL fallback for CI
1 parent 58f1eed commit cee78c3

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.travis.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
osx_image: xcode8.3
2-
sudo: required
3-
dist: trusty
41
language: c
52
matrix:
63
include:
7-
- os: osx
8-
- os: linux
9-
env: CC=clang CXX=clang++ npm_config_clang=1
10-
compiler: clang
4+
- os: windows
115
cache:
126
directories:
137
- node_modules
@@ -18,13 +12,8 @@ addons:
1812
packages:
1913
- libgnome-keyring-dev
2014
- icnsutils
21-
before_install:
22-
- mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([
23-
"$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz
24-
| tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
25-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi
2615
install:
27-
- nvm install 7
16+
- nvm install 9
2817
- curl -o- -L https://yarnpkg.com/install.sh | bash
2918
- source ~/.bashrc
3019
- npm install -g xvfb-maybe
@@ -33,4 +22,4 @@ script:
3322
- yarn run build
3423
branches:
3524
only:
36-
- master
25+
- master

src/renderer/main.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ if (!process.env.IS_WEB) Vue.use(require('vue-electron'))
1111
Vue.http = Vue.prototype.$http = axios
1212
Vue.config.productionTip = false
1313
Vue.prototype.$fs = require('fs-extra')
14+
if (!process.env.PROD_URL) {
15+
process.env.PROD_URL = 'https://dokdrop.whatan.app/api/'
16+
}
1417
Vue.prototype.$backend = (process.env.NODE_ENV === 'development') ? process.env.LOCAL_URL : process.env.PROD_URL
1518
Vue.prototype.$axios = require('axios')
1619

0 commit comments

Comments
 (0)