@farris/cli 1.0.16 → 1.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ci/cli.js +4 -3
- package/package.json +1 -1
package/ci/cli.js
CHANGED
|
@@ -81,10 +81,10 @@ cli
|
|
|
81
81
|
*/
|
|
82
82
|
function getLastCommit() {
|
|
83
83
|
if (hasTags()) {
|
|
84
|
-
log
|
|
84
|
+
console.log("getLastTagInBranch");
|
|
85
85
|
return childProcess.execSync("git", ["describe", "--tags", "--abbrev=0"]);
|
|
86
86
|
}
|
|
87
|
-
log
|
|
87
|
+
console.log("getFirstCommit");
|
|
88
88
|
return childProcess.execSync("git", ["rev-list", "--max-parents=0", "HEAD"]);
|
|
89
89
|
}
|
|
90
90
|
|
|
@@ -111,6 +111,7 @@ function hasTags() {
|
|
|
111
111
|
*/
|
|
112
112
|
function checkProjectChanges(projectPath) {
|
|
113
113
|
const lastCommit = getLastCommit();
|
|
114
|
+
console.log(`last commit ${lastCommit}`);
|
|
114
115
|
return childProcess
|
|
115
116
|
// 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
|
|
116
117
|
.exec("git", ["diff", "--name-only", lastCommit, projectPath])
|
|
@@ -178,7 +179,7 @@ function commitChanges(updatedVersions, commitUrl) {
|
|
|
178
179
|
console.log(`executing git push ${branch}`);
|
|
179
180
|
// 提交变更集
|
|
180
181
|
if (commitUrl) {
|
|
181
|
-
return childProcess.exec("git", ["push",
|
|
182
|
+
return childProcess.exec("git", ["push", commitUrl]);
|
|
182
183
|
} else {
|
|
183
184
|
return childProcess.exec('git', ['push']);
|
|
184
185
|
}
|