build: fix release scripts (NG-ZORRO#3840)

wzhudev · Jul 22, 2019 · 0b27681 · 0b27681
1 parent 146de58
commit 0b27681
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/scripts/release/git-client.ts b/scripts/release/git-client.ts
@@ -27,8 +27,8 @@ export class GitClient {
     return this.spawnGitProcess(['checkout', '-b', branchName]).status === 0;
   }
 
-  pushBranchToRemote(branchName: string, remoteName: string = this.remoteGitUrl): boolean {
-    return this.spawnGitProcess(['push', remoteName, branchName]).status === 0;
+  pushBranchToRemote(branchName: string, force: boolean = false, remoteName: string = this.remoteGitUrl): boolean {
+    return this.spawnGitProcess(['push', remoteName, branchName, `${force && '-f'}`]).status === 0;
   }
-  
+
 }
diff --git a/scripts/release/release-site.ts b/scripts/release/release-site.ts
@@ -31,7 +31,7 @@ export function releaseSite(version: string): boolean {
 
   git.stageAllChanges();
   git.createNewCommit(`release: ${version}`);
-  const pushed = git.pushBranchToRemote(branchName);
+  const pushed = git.pushBranchToRemote(branchName, true);
   removeSync(docDir);
   return pushed;
 }
diff --git a/scripts/release/release.ts b/scripts/release/release.ts
@@ -13,7 +13,10 @@ const print = console.log;
 const log = {
   info: (msg: string) => print(chalk.bgBlue.black(' INFO\t'), chalk.blue(msg)),
   warn: (msg: string) => print(chalk.bgYellow.black(' WARN\t'), chalk.yellow(msg)),
-  error: (msg: string) => print(chalk.bgRed.black(' ERROR\t'), chalk.red(msg)),
+  error: (msg: string) => {
+    print(chalk.bgRed.black(' ERROR\t'), chalk.red(msg));
+    process.exit(1);
+  },
   success: (msg: string) => print(chalk.bgGreen.black(' SUCCESS\t'), chalk.green(msg))
 };
 
@@ -22,11 +25,6 @@ const log = {
 run();
 
 function run(): void {
-  if (hasUncommittedChanges()) {
-    log.error('Current working tree has changes which are not committed. ' +
-      'Please make sure your working tree is clean.');
-    return;
-  }
   const stages = [
     {
       name: 'Fetch upstream',
@@ -131,14 +129,19 @@ function bumpVersion(): void {
 }
 
 function fetchUpstream(): void {
+  if (hasUncommittedChanges()) {
+    log.error('Current working tree has changes which are not committed. ' +
+      'Please make sure your working tree is clean.');
+    return;
+  }
   log.info('Fetching upstream...');
   const remoteName = getUpstreamRemoteName();
   if (!remoteName) {
     log.error('The valid remote name does not exist. View detail https://help.github.com/en/articles/configuring-a-remote-for-a-fork');
     return;
   }
   execSync('git checkout master');
-  execSync(`git pull ${remoteName} master`);
+  execSync(`git pull ${remoteName} master -f`);
   execSync(`git fetch ${remoteName} master --prune --tags`);
   log.success('Older versions fetched!');
 }