Skip to content

Commit

Permalink
Merge 1b10a37 into c044c8d
Browse files Browse the repository at this point in the history
  • Loading branch information
mmkal committed Jul 19, 2019
2 parents c044c8d + 1b10a37 commit 5731c6c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services: docker
cache:
directories:
- $HOME/.npm
node_js: 12
node_js: ['12']
before_script:
- npm prune
- docker-compose pull
Expand All @@ -12,6 +12,8 @@ script:
- npm run ci
after_success:
- npm run coveralls
- npx lerna version --yes
- npx publish from-package --yes
branches:
except:
- /^v\d+\.\d+\.\d+$/
8 changes: 7 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@
"packages": [
"packages/*"
],
"version": "0.0.0"
"version": "independent",
"command": {
"version": {
"allowBranch": ["lerna-version"],
"conventionalCommits": true
}
}
}
1 change: 1 addition & 0 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "demo project using packages in slonik-tools repo",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"private": true,
"scripts": {
"build": "cd ../.. && npm run build",
"typegen": "slonik-typegen src/generated/db",
Expand Down
8 changes: 4 additions & 4 deletions packages/migrator/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/migrator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"homepage": "https://github.com/mmkal/slonik-tools#readme",
"dependencies": {
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"umzug": "^2.2.0"
},
"devDependencies": {
Expand Down

0 comments on commit 5731c6c

Please sign in to comment.