Skip to content

Commit

Permalink
Merge pull request electron-userland#186 from develar/test-published-…
Browse files Browse the repository at this point in the history
…package

test: run test against published package
  • Loading branch information
develar committed Mar 1, 2016
2 parents c827770 + 65478dc commit ac27220
Show file tree
Hide file tree
Showing 107 changed files with 261 additions and 43,779 deletions.
1 change: 1 addition & 0 deletions .idea/dictionaries/develar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/electron-builder.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ tsconfig.json
typings.json
npm-debug.log
test/
tslint.json
CONTRIBUTING.md
appveyor.yml
.eslintrc
.editorconfig
.travis.yml
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ env:

language: ruby

rvm:
- 2.2.0

cache:
directories:
- node_modules
Expand All @@ -26,7 +23,7 @@ addons:
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gnu-tar dpkg libicns; fi
- gem install --no-rdoc fpm
- gem install --no-rdoc --no-ri fpm

install:
- rm -rf ~/.nvm
Expand All @@ -42,7 +39,7 @@ script:
- npm run test

after_success:
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then npm run semantic-release ; fi
- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then npm run semantic-release ; fi

branches:
except:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ install:
build: off

test_script:
- npm run test-win
- npm run test
2 changes: 1 addition & 1 deletion cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ builder.build( Object.assign( cli.flags, {
* @return {Object} configuration
*/
function getConfigFromFile( configPath, property ) {
var config = require( configPath );
var config = JSON.parse( fs.readFileSync( configPath ) );

if ( property ) {
if ( config[ property ] ) {
Expand Down
166 changes: 0 additions & 166 deletions cli.spec.js

This file was deleted.

20 changes: 0 additions & 20 deletions example-app/Example-linux-x64/LICENSE

This file was deleted.

Loading

0 comments on commit ac27220

Please sign in to comment.