Skip to content

Commit 3737824

Browse files
committed
Use the lastTag instead of tag in the git-tag-commit data generator
1 parent 43b7cbf commit 3737824

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

lib/data-generators/git-tag-commit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ module.exports = CoreObject.extend({
1616
return RSVP.reject('Could not find git repository');
1717
}
1818

19-
var tag = info.tag;
19+
var tag = info.lastTag;
2020
var sha = info.sha.slice(0, 8);
2121

22-
if (!info.tag || !sha) {
22+
if (!tag || !sha) {
2323
return RSVP.reject('Could not build revision with tag `' + tag + '` and commit hash `' + sha + '`');
2424
}
2525

2626
return RSVP.resolve({
27-
revisionKey: info.tag + separator + sha,
27+
revisionKey: tag + separator + sha,
2828
timestamp: new Date().toISOString()
2929
});
3030
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"chalk": "^1.1.3",
3535
"core-object": "^2.0.6",
3636
"ember-cli-deploy-plugin": "^0.2.6",
37-
"git-repo-info": "^1.3.0",
37+
"git-repo-info": "^2.0.0",
3838
"minimatch": "^3.0.3",
3939
"rsvp": "^3.5.0",
4040
"simple-git": "^1.57.0"

yarn.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2221,10 +2221,14 @@ getpass@^0.1.1:
22212221
dependencies:
22222222
assert-plus "^1.0.0"
22232223

2224-
git-repo-info@^1.0.4, git-repo-info@^1.3.0:
2224+
git-repo-info@^1.0.4:
22252225
version "1.4.1"
22262226
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
22272227

2228+
git-repo-info@^2.0.0:
2229+
version "2.0.0"
2230+
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.0.0.tgz#2e7a68ba3d0253e8e885c4138f922e6561de59bb"
2231+
22282232
git-tools@^0.1.4:
22292233
version "0.1.4"
22302234
resolved "https://registry.yarnpkg.com/git-tools/-/git-tools-0.1.4.tgz#5e43e59443b8a5dedb39dba663da49e79f943978"

0 commit comments

Comments
 (0)