Skip to content

Commit

Permalink
Fix ci deploys (#204)
Browse files Browse the repository at this point in the history
* ci: 🎡 Fix CI deploys by disabling stash of all untracked files

 * There was an issue with Travis where it ran `git stash --all` during
the pre-deploy step.  This caused the `dist` directory to get wiped and
all created deploys to be broken.
  * Added the `skip_cleanup` flag in Travis config to prevent this
 * Added a `.npmignore` file to prevent superfluous files from being
included in the tarball uploaded to npm

* v5.9.9

* Add myself to `all-contributorsrc`

* ci: 🎡 Removed version-specific link; deploy on tags only

The deploy script deploys all the time, not just on tagged releases.
Additionally, the ${version} tag was really slick when linking to docs,
but the docs have barely changed since v0.0.1 and the link breaks
sometimes.

* docs: ✏️ Fix broken links

More broken links after repo URL change
  • Loading branch information
Ameobea authored and sezna committed Aug 28, 2019
1 parent ecb5c43 commit 69aaec2
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 12 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,16 @@
"infra",
"review"
]
},
{
"login": "ameobea",
"name": "Casey Primozic",
"avatar_url": "https://avatars3.githubusercontent.com/u/4335849?v=4",
"profile": "https://cprimozic.com",
"contributions": [
"infra",
"review"
]
}
],
"repoType": "github"
Expand Down
10 changes: 10 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
node_modules
.all-contributorsrc
.babelrc
.git
.github
.travis.yml
.vscode
cli-test
test
yarn.lock
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ deploy:
secure: lwScVlyKn606QB57DkpfpXqGP8WSEycQzTcGGkXZNrj7Gf1gQZbbBqVbGoH4Mc6Zqjg8vgZw9XbqMzPSdPXrcWcI5igfoebkAdN/fofIOfRsZUM7+KC4cgm6Van1hCixLZN21ZCzsYq+/imPUTuLogxyE/GgSdKM7tf13MLgN6ccYkaG/sdwtMiclfxZrSbvKEQAJlr3pZp2yb9zHvplmA6w06wea1l3A2O8zDhMiY96lidAz8ykzqInkIGIqdAwlDjX1wX2qEwYuWu/yy89S3ooB3Eal1Ps84dXFLHSNLX44GUwLAJRY25ZlQgf9u54UMYn4URdt0LbI10EkflB9DgNluq9xzZJOzf3xnDeRiVTx0glEdf3n0h4stBzBTmB5jLUZjgenmfwa5ZSM4CHlybMGACGTiNnzd9dZUq5decAaKMueo3qns+hJR8AVm4j3Mc50L7hJ2bayX6P3hMpUgc2mipxub59tecggMYayYw8HIpCj2s0mxstTfJRVNtZzvDZFnJqEPTSsorVf3LPd7eIuW1fnMl7rHjMGXoej4YKpdeNVf5/pWdga1x5iLYpr2cJU/vhXKlELUF1PTC0tvG4JFWO9LFsn1ECordyDr1/hA3d2ayALa7n5l2N5gMz9r3Ml2SXjDrcpCPdor1lxNXnxjyRa+6grXbgtx+zslY=
provider: npm
email: "[email protected]"
skip_cleanup: true
on:
tags: true
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ scripts are available.
> pull requests from branches on your fork. To do this, run:
>
> ```
> git remote add upstream https://github.com/kentcdodds/nps.git
> git remote add upstream https://github.com/sezna/nps.git
> git fetch upstream
> git branch --set-upstream-to=upstream/master master
> ```
Expand Down Expand Up @@ -79,4 +79,4 @@ Also, please watch the repo and respond to questions/bug reports/feature request
[semantic-release]: https://npmjs.com/package/semantic-release
[convention]: https://github.com/conventional-changelog/conventional-changelog-angular/blob/ed32559941719a130bb0327f886d6a32a8cbc2ba/convention.md
[all-contributors]: https://github.com/kentcdodds/all-contributors
[issues]: https://github.com/kentcdodds/nps/issues
[issues]: https://github.com/sezna/nps/issues
2 changes: 1 addition & 1 deletion cli-test/__tests__/__snapshots__/cli.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Object {

exports[`with a missing config 1`] = `
Object {
"stderr": "Unable to find JS config at \\"./something-that-does-not-exist.js\\". https://github.com/sezna/nps/blob/v5.9.6/other/ERRORS_AND_WARNINGS.md#unable-to-find-config
"stderr": "Unable to find JS config at \\"./something-that-does-not-exist.js\\". https://github.com/sezna/nps/blob/master/other/ERRORS_AND_WARNINGS.md#unable-to-find-config
",
"stdout": "",
}
Expand Down
4 changes: 2 additions & 2 deletions other/ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Want to do

- Check [the issues](https://github.com/kentcdodds/nps/issues)
- Check [the issues](https://github.com/sezna/nps/issues)

## Might do

Expand All @@ -12,7 +12,7 @@

- lifecycle hooks. Unfortunately by doing things this way one of the major things we lose is the ability to utilize
npm script lifecycle hooks. This makes me sad. But it was decided to not do this in
[#83](https://github.com/kentcdodds/nps/pull/83)
[#83](https://github.com/sezna/nps/pull/83)
- Recreate gulp
- Allow you to specify an individual script as a function to call rather than spawn a process. Instead you should create
a file and use the script to call into that script file. We want to keep this as simple and straightforward as possible.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nps",
"version": "5.9.6",
"version": "5.9.9",
"description": "All the benefits of npm scripts without the cost of a bloated package.json and limits of json",
"main": "dist/index",
"scripts": {
Expand Down Expand Up @@ -80,4 +80,4 @@
"url": "https://github.com/kentcdodds/nps/issues"
},
"homepage": "https://github.com/kentcdodds/nps#readme"
}
}
2 changes: 1 addition & 1 deletion src/__tests__/get-logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test('allows you to log warnings/errors with a ref', () => {
...message,
oneLineTrim`
https://github.com/sezna/nps
/blob/v5.9.6
/blob/master
/other/ERRORS_AND_WARNINGS.md#han-solo
`,
'this is extra',
Expand Down
5 changes: 1 addition & 4 deletions src/get-logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import arrify from 'arrify'
import {oneLineTrim} from 'common-tags'
import {isPlainObject, includes} from 'lodash'

const {version} = require('../package.json')

const shouldLog = {
// fn called logLevels
info: getShouldLogFn('', 'debug', 'info'),
Expand Down Expand Up @@ -47,8 +45,7 @@ function getMessage(first, ...rest) {

function getLink(ref) {
return oneLineTrim`
https://github.com/sezna/nps/blob/v
${version}
https://github.com/sezna/nps/blob/master
/other/ERRORS_AND_WARNINGS.md#
${ref}
`
Expand Down

0 comments on commit 69aaec2

Please sign in to comment.