You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/02/04 02:59:00 UTC
[1/2] cordova-coho git commit: When tagging,
use `git push origin refs/tags/FOO` rather than `git push --tags`
Repository: cordova-coho
Updated Branches:
refs/heads/master 7a316fff6 -> 7109ada05
When tagging, use `git push origin refs/tags/FOO` rather than `git push --tags`
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/7da7c07c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/7da7c07c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/7da7c07c
Branch: refs/heads/master
Commit: 7da7c07c1e2ab54504bd4db761ace92016eb9b51
Parents: 7a316ff
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Feb 3 20:57:17 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Feb 3 20:57:17 2015 -0500
----------------------------------------------------------------------
src/cadence-release.js | 2 +-
src/platform-release.js | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/7da7c07c/src/cadence-release.js
----------------------------------------------------------------------
diff --git a/src/cadence-release.js b/src/cadence-release.js
index 6dab4c0..c25b6c6 100644
--- a/src/cadence-release.js
+++ b/src/cadence-release.js
@@ -273,7 +273,7 @@ exports.tagReleaseBranchCommand = function*(argv) {
} else {
yield execOrPretend(executil.ARGS('git tag ' + version));
}
- yield execOrPretend(executil.ARGS('git push --tags ' + repo.remoteName + ' ' + branchName));
+ yield execOrPretend(executil.ARGS('git push ' + repo.remoteName + ' refs/tags/' + version));
} else {
print('Repo ' + repo.repoName + ' is already tagged.');
}
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/7da7c07c/src/platform-release.js
----------------------------------------------------------------------
diff --git a/src/platform-release.js b/src/platform-release.js
index cf2c083..fc6e50c 100644
--- a/src/platform-release.js
+++ b/src/platform-release.js
@@ -232,12 +232,13 @@ function *tagJs(repo, version, pretend) {
// git fetch
yield repoupdate.updateRepos([cordovaJsRepo], ['master'], false);
- if (yield gitutil.tagExists(repo.id + '-' + version)) {
- yield execOrPretend(executil.ARGS('git tag ' + repo.id + '-' + version + ' --force'));
+ var tagName = repo.id + '-' + version;
+ if (yield gitutil.tagExists(tagName)) {
+ yield execOrPretend(executil.ARGS('git tag ' + tagName + ' --force'));
} else {
- yield execOrPretend(executil.ARGS('git tag ' + repo.id + '-' + version));
+ yield execOrPretend(executil.ARGS('git tag ' + tagName));
}
- yield execOrPretend(executil.ARGS('git push --tags ' + repo.remoteName));
+ yield execOrPretend(executil.ARGS('git push ' + repo.remoteName + ' refs/tags/' + tagName));
});
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-coho git commit: platforms-release-process.md: Add in a
`--pretend` step when doing tagging
Posted by ag...@apache.org.
platforms-release-process.md: Add in a `--pretend` step when doing tagging
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/7109ada0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/7109ada0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/7109ada0
Branch: refs/heads/master
Commit: 7109ada05c22b2f15ea3af59dc69689a5e653cfb
Parents: 7da7c07
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Feb 3 20:58:29 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Feb 3 20:58:46 2015 -0500
----------------------------------------------------------------------
docs/platforms-release-process.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/7109ada0/docs/platforms-release-process.md
----------------------------------------------------------------------
diff --git a/docs/platforms-release-process.md b/docs/platforms-release-process.md
index 74dbbb6..2c0ca9e 100644
--- a/docs/platforms-release-process.md
+++ b/docs/platforms-release-process.md
@@ -114,6 +114,8 @@ Cherry-pick the RELEASENOTES commit back into master branch
Tag:
+ coho tag-release --version 3.5.0 -r android --pretend
+ # Seems okay:
coho tag-release --version 3.5.0 -r android
## Tagging RC of cordova-cli
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org