Skip to content

Commit

Permalink
chore: use bundled yarn to test on travis, remove validate-commit-msg
Browse files Browse the repository at this point in the history
validate-commit-msg/husky are the source of some issues (commit validation doesn't work correctly sometimes, all git hooks (not only requried) are installed (may conflict withs git lfs))
  • Loading branch information
develar committed Dec 9, 2016
1 parent bbd9e91 commit 88ce3b7
Show file tree
Hide file tree
Showing 6 changed files with 116,519 additions and 103 deletions.
3 changes: 2 additions & 1 deletion .idea/rc-producer.yml

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

3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ install:
- nvm install $NODE_VERSION
- nvm use --delete-prefix $NODE_VERSION
- mkdir -p ~/Library/Caches/Yarn
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$PATH:$HOME/.yarn/bin"
- ln -sf $PWD/test/yarn.js /usr/local/bin/yarn
- yarn install --pure-lockfile
- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" && "$TRAVIS_TAG" == "" && "$PUBLISH_TO_NPM" == "true" ]]; then yarn add @develar/semantic-release@next --dev ; fi

Expand Down
2 changes: 1 addition & 1 deletion nsis-auto-updater/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-auto-updater",
"version": "0.6.2",
"version": "0.7.0",
"description": "NSIS Auto Updater",
"main": "out/nsis-auto-updater/src/main.js",
"author": "Vladimir Krivosheev",
Expand Down
17 changes: 7 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
"update-wiki": "git subtree split -b wiki --prefix docs/ && git push -f wiki wiki:master",
"whitespace": "whitespace 'src/**/*.ts'",
"docker-images": "docker/build.sh",
"test-deps-mac": "brew install rpm dpkg mono lzip gnu-tar graphicsmagick xz && brew install wine --without-x11",
"precommit": "validate-commit-msg"
"test-deps-mac": "brew install rpm dpkg mono lzip gnu-tar graphicsmagick xz && brew install wine --without-x11"
},
"repository": "electron-userland/electron-builder",
"engines": {
Expand All @@ -50,7 +49,8 @@
"Windows",
"OS X",
"MacOS",
"Mac"
"Mac",
"appx"
],
"author": "Stefan Judis",
"license": "MIT",
Expand Down Expand Up @@ -109,16 +109,15 @@
"babel-plugin-transform-es2015-spread": "^6.8.0",
"babel-plugin-transform-inline-imports-commonjs": "^1.2.0",
"decompress-zip": "^0.3.0",
"depcheck": "^0.6.6",
"depcheck": "^0.6.7",
"diff": "^3.1.0",
"husky": "^0.11.9",
"jest-cli": "^17.0.3",
"jest-environment-node-debug": "^0.0.2",
"json8": "^0.9.2",
"path-sort": "^0.1.0",
"ts-babel": "^1.2.2",
"tslint": "^4.0.2",
"typescript": "^2.1.1",
"validate-commit-msg": "^2.8.2",
"typescript": "^2.1.4",
"whitespace": "^2.1.0"
},
"babel": {
Expand All @@ -145,6 +144,7 @@
],
"env": {
"test": {
"sourceMaps": "inline",
"plugins": [
[
"transform-async-to-module-method",
Expand Down Expand Up @@ -179,8 +179,5 @@
],
"setupTestFrameworkScriptFile": "test/jestSetup.js"
},
"release": {
"verifyConditions": []
},
"typings": "./out/electron-builder.d.ts"
}
Loading

0 comments on commit 88ce3b7

Please sign in to comment.