Skip to content

Commit b382220

Browse files
authored
Merge pull request #56 from ember-cli-deploy/chore/update-ember-cli
Upgrade ember-cli & embrace being a node-only ember-cli addon
2 parents 7eeb766 + af18c22 commit b382220

24 files changed

+5239
-167
lines changed

.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+
};

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,5 +13,5 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
1717
testem.log

.jshintrc

Lines changed: 0 additions & 32 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

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,11 @@ The following properties are expected to be present on the deployment `context`
223223

224224
## Running Tests
225225

226-
- `npm test`
226+
* yarn test
227+
228+
## Why `ember build` and `ember test` don't work
229+
230+
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.
227231

228232
[1]: http://ember-cli-deploy.com/ "Plugin Documentation"
229233
[2]: 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-revision-data-<version>.tgz`
11+
3. `ember release`
12+
4. `npm publish`
2013

2114
### Create a github release
2215

bin/prepare-release

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

bower.json

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

ember-cli-build.js

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

index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* jshint node: true */
21
'use strict';
32

43
var RSVP = require('rsvp');
@@ -24,7 +23,7 @@ module.exports = {
2423
return context.distFiles;
2524
},
2625

27-
scm: function(context) {
26+
scm: function(/* context */) {
2827
return require('./lib/scm-data-generators')['git'];
2928
}
3029

0 commit comments

Comments
 (0)