Skip to content

Commit b06ea06

Browse files
authored
Merge pull request #71 from ember-cli-deploy/chore/update-ember-cli
Upgrade ember-cli & embrace being a node-only ember-cli addon
2 parents 036d46e + 2dd4b17 commit b06ea06

27 files changed

+5293
-232
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.ember-cli

Lines changed: 0 additions & 9 deletions
This file was deleted.

.eslintrc.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 6,
5+
sourceType: 'module'
6+
},
7+
extends: 'eslint:recommended',
8+
env: {
9+
node: true
10+
},
11+
rules: {
12+
}
13+
};

.jshintrc

Lines changed: 0 additions & 33 deletions
This file was deleted.

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
---
22
language: node_js
33
node_js:
4-
- "0.12"
4+
- "6"
55

66
sudo: false
77

88
cache:
9-
directories:
10-
- node_modules
9+
yarn: true
1110

1211
before_install:
13-
- "npm config set spin false"
14-
- "npm install -g npm@^2"
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash
13+
- export PATH=$HOME/.yarn/bin:$PATH
1514

1615
install:
17-
- npm install -g bower
18-
- npm install
19-
- bower install
16+
- yarn install --no-lockfile
2017

2118
script:
22-
- npm test
19+
- yarn test

Brocfile.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,13 @@ The following properties are used if present on the deployment `context` object:
330330

331331
## Running Tests
332332

333-
- `npm test`
333+
* yarn test
334334

335-
[1]: https://github.com/lukemelia/ember-cli-deploy-lightning-pack "ember-cli-deploy-lightning-pack"
335+
## Why `ember build` and `ember test` don't work
336+
337+
Since this is a node-only ember-cli addon, this package does not include many files and dependencies which are part of ember-cli's typical `ember build` and `ember test` processes.
338+
339+
[1]: https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack "ember-cli-deploy-lightning-pack"
336340
[2]: http://ember-cli.github.io/ember-cli-deploy/plugins "Plugin Documentation"
337341
[3]: https://www.npmjs.com/package/redis "Redis Client"
338342
[4]: https://github.com/ember-cli-deploy/ember-cli-deploy-build "ember-cli-deploy-build"

RELEASE.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@ The following steps should navigate you through the release process to ensure as
44

55
## Steps
66

7-
### Commit the changelog and publish to NPM
7+
### Commit the changelog, bump version, and publish to NPM
88

99
1. run `./bin/changelog` and add output to `CHANGELOG.md`
1010
2. edit changelog output to be as user-friendly as possible (drop [INTERNAL] changes etc.)
11-
3. bump package.json version
12-
4. `./bin/prepare-release`
13-
5. `git checkout master`
14-
6. `git add` the modified `package.json` and `CHANGELOG.md`
15-
7. `git commit -m "Release vx.y.z"`
16-
8. `git push upstream master`
17-
9. `git tag "vx.y.z"`
18-
10. `git push upstream vx.y.z`
19-
11. `npm publish ./ember-cli-deploy-redis-<version>.tgz`
11+
3. `ember release`
12+
4. `npm publish`
2013

2114
### Create a github release
2215

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)