Skip to content

Commit

Permalink
Change Travis configuration to Linux and NPM
Browse files Browse the repository at this point in the history
  • Loading branch information
sallar committed Mar 9, 2017
1 parent d384deb commit 68a65e7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 41 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os:
- osx
#os:
# - osx

language: node_js

Expand All @@ -8,10 +8,8 @@ node_js:

script: ./script/travis.sh

cache:
yarn: true
directories:
- node_modules
before_install:
- rm yarn.lock

branches:
only:
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
"devDependencies": {
"@types/electron": "^1.4.29",
"@types/node": "^6.0.45",
"@types/rc-tree": "^1.4.2",
"@types/react": "^0.14.41",
"@types/redux": "^3.6.31",
"ava": "^0.17.0",
Expand Down Expand Up @@ -152,7 +151,7 @@
"ms": "^0.7.2",
"node-sass": "^3.10.1",
"raw-loader": "^0.5.1",
"rc-tree": "^1.4.5",
"rc-tree": "^1.3.9",
"react": "^15.4.0",
"react-addons-test-utils": "^15.4.0",
"react-dom": "^15.4.0",
Expand Down
2 changes: 1 addition & 1 deletion script/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ fi
node --version
npm --version

npm run build && npm run release:mac
npm run build
npm test
3 changes: 2 additions & 1 deletion test/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { Application } from 'spectron';

test.beforeEach(async t => {
t.context.app = new Application({
path: path.join(__dirname, '../release/mac/Buttercup.app/Contents/MacOS/Buttercup')
path: require('electron'),
args: [path.join(__dirname, '../app')]
});

await t.context.app.start();
Expand Down
36 changes: 5 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,7 @@
version "6.0.62"
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.62.tgz#85222c077b54f25b57417bb708b9f877bda37f89"

"@types/rc-tree@^1.4.2":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@types/rc-tree/-/rc-tree-1.4.2.tgz#909ebe4a841928d2baf1079ffa91477b4e53e427"
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@^0.14.41":
"@types/react@^0.14.41":
version "0.14.57"
resolved "https://registry.yarnpkg.com/@types/react/-/react-0.14.57.tgz#1878a8654fafdd1d381b8457292b6433498c5b62"

Expand Down Expand Up @@ -99,12 +93,6 @@ acorn@^3.0.4:
version "3.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"

[email protected]:
version "1.0.2"
resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.0.2.tgz#8faed2c41008721cf111da1d30d995b85be42bed"
dependencies:
object-assign "4.x"

ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
Expand Down Expand Up @@ -5092,7 +5080,7 @@ lodash.kebabcase@^4.0.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"

lodash.keys@^3.0.0, lodash.keys@^3.1.2:
lodash.keys@^3.0.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
dependencies:
Expand Down Expand Up @@ -6597,21 +6585,13 @@ [email protected]:
dependencies:
css-animation "^1.3.0"

rc-tree@^1.4.5:
version "1.4.5"
resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.4.5.tgz#5712ccabff0eec5073fbd5b717f4c930d003ce7b"
rc-tree@^1.3.9:
version "1.4.2"
resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.4.2.tgz#e1ef4a14a24d3bbc57c1273873a3a86db6fb94df"
dependencies:
classnames "2.x"
object-assign "4.x"
rc-animate "2.x"
rc-util "^4.0.2"

rc-util@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.0.2.tgz#5804f8b141a13c8c14d7c265a7d21d298195af46"
dependencies:
add-dom-event-listener "1.x"
shallowequal "^0.2.2"

rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@~1.1.6:
version "1.1.6"
Expand Down Expand Up @@ -7264,12 +7244,6 @@ sha.js@^2.3.6:
dependencies:
inherits "^2.0.1"

shallowequal@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e"
dependencies:
lodash.keys "^3.1.2"

shelljs@^0.7.0, shelljs@^0.7.5:
version "0.7.6"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
Expand Down

0 comments on commit 68a65e7

Please sign in to comment.