Merge pull request #21 from technote-space/release/v1.0.3

release/v1.0.3

Author: technote-space

README.md

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Release GitHub Actions
-        uses: technote-space/[email protected].2
+        uses: technote-space/[email protected].3
         with:
           ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
 ```

package.json

@@ -22,7 +22,6 @@
     "@actions/core": "^1.0.0",
     "@actions/github": "^1.0.0",
     "js-yaml": "^3.13.1",
-    "rimraf": "^3.0.0",
     "signale": "^1.4.0"
   },
   "devDependencies": {

src/utils/command.ts

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import rimraf from 'rimraf';
 import signale from 'signale';
 import {exec} from 'child_process';
 import {Context} from '@actions/github/lib/context';
@@ -12,41 +11,54 @@ export const deploy = async (branch: string, context: Context) => {
     const pushDir = path.resolve(workDir, 'push');
     signale.info(`Deploying branch %s to %s`, branch, getRepository(context));
 
-    rimraf(workDir, () => {
-    });
     fs.mkdirSync(pushDir, {recursive: true});
-    await prepareFiles(buildDir, pushDir, context);
-    await cloneForBranch(pushDir, branch, context);
-    await copyFiles(buildDir, pushDir);
-    await config(pushDir);
-    await commit(pushDir);
+    if (!await cloneForBranch(pushDir, branch, context)) return;
+    if (!await prepareFiles(buildDir, pushDir, context)) return;
+    if (!await copyFiles(buildDir, pushDir)) return;
+    if (!await config(pushDir)) return;
+    if (!await commit(pushDir)) return;
     await push(pushDir, branch, context);
 };
 
-export const prepareFiles = async (buildDir: string, pushDir: string, context: Context) => {
+export const prepareFiles = async (buildDir: string, pushDir: string, context: Context): Promise<boolean> => {
     signale.info('Preparing files for release');
 
     fs.mkdirSync(buildDir, {recursive: true});
     await cloneForBuild(buildDir, context);
     await runBuild(buildDir);
+    return true;
 };
 
-const cloneForBranch = async (pushDir: string, branch: string, context: Context) => {
+const cloneForBranch = async (pushDir: string, branch: string, context: Context): Promise<boolean> => {
     signale.info(`Cloning the branch %s from the remote repo`, branch);
 
     const url = getGitUrl(context);
     await execAsync(`git -C ${pushDir} clone --quiet --branch=${branch} --depth=1 ${url} .`, true, 'git clone', true);
-    if (!fs.existsSync(path.resolve(pushDir, '.git'))) {
+
+    const clonedBranch = await getBranchName(pushDir);
+    if (branch !== clonedBranch) {
+        signale.info(`remote branch ${branch} not found.`);
+        signale.info(`now branch: ${clonedBranch}`);
+
+        await execAsync(`rm -rdf ${pushDir}`);
+        fs.mkdirSync(pushDir, {recursive: true});
         await gitInit(pushDir);
         await gitCheckout(pushDir, branch);
     }
+    return true;
+};
+
+const getBranchName = async (pushDir: string): Promise<string> => {
+    if (!fs.existsSync(path.resolve(pushDir, '.git'))) {
+        return '';
+    }
+    return (await execAsync(`git -C ${pushDir} branch -a | grep -E '^\\*' | cut -b 3-`)).trim();
 };
 
 const gitInit = async (pushDir: string) => {
     signale.info('Initializing local git repo');
 
     await execAsync(`git -C ${pushDir} init .`);
-
 };
 
 const gitCheckout = async (pushDir: string, branch: string) => {
@@ -55,27 +67,33 @@ const gitCheckout = async (pushDir: string, branch: string) => {
     await execAsync(`git -C ${pushDir} checkout --orphan "${branch}"`);
 };
 
-const config = async (pushDir: string) => {
+const config = async (pushDir: string): Promise<boolean> => {
     const name = getCommitName();
     const email = getCommitEmail();
     signale.info('Configuring git committer to be %s <%s>', name, email);
 
     await execAsync(`git -C ${pushDir} config user.name "${name}"`);
     await execAsync(`git -C ${pushDir} config user.email "${email}"`);
+    return true;
 };
 
-const commit = async (pushDir: string) => {
+const commit = async (pushDir: string): Promise<boolean> => {
     const message = getCommitMessage();
     await execAsync(`git -C ${pushDir} add --all --force`);
+    if (!await checkDiff(pushDir)) {
+        signale.info('There is no diff.');
+        return false;
+    }
     await execAsync(`git -C ${pushDir} commit -qm "${message}"`);
     await execAsync(`git -C ${pushDir} show --stat-count=10 HEAD`);
+    return true;
 };
 
 const push = async (pushDir: string, branch: string, context: Context) => {
     signale.info('Pushing to %s@%s', getRepository(context), branch);
 
     const url = getGitUrl(context);
-    await execAsync(`git -C ${pushDir} push --quiet "${url}" "${branch}":"${branch}"`, true, 'git push');
+    await execAsync(`git -C ${pushDir} push --quiet "${url}" "${branch}":"refs/heads/${branch}"`, true, 'git push');
 };
 
 const cloneForBuild = async (buildDir: string, context: Context) => {
@@ -97,19 +115,25 @@ const runBuild = async (buildDir: string) => {
     await execAsync(`cd ${current}`);
 };
 
-const copyFiles = async (buildDir: string, pushDir: string) => {
+const copyFiles = async (buildDir: string, pushDir: string): Promise<boolean> => {
     signale.info('=== Copying %s contents to %s ===', buildDir, pushDir);
 
     await execAsync(`rsync -rl --exclude .git --delete "${buildDir}/" ${pushDir}`);
+    return true;
+};
+
+const checkDiff = async (pushDir: string): Promise<boolean> => {
+    return (await execAsync(`git -C ${pushDir} status --short -uno`)).split(/\r\n|\n/).filter(line => line.match(/^[MDA]\s+/)).length > 0;
 };
 
 const execAsync = (command: string, quiet: boolean = false, altCommand: string | null = null, suppressError: boolean = false) => new Promise<string>((resolve, reject) => {
     if ('string' === typeof altCommand) signale.info(`Run command: ${altCommand}`);
     else if (!quiet) signale.info(`Run command: ${command}`);
     exec(command + (quiet ? ' > /dev/null 2>&1' : '') + (suppressError ? ' || :' : ''), (error, stdout) => {
         if (error) {
-            if ('string' === typeof altCommand) reject(new Error(`command [${altCommand}] exited with code ${error.code}.`));
-            else if (!quiet) reject(new Error(`command [${command}] exited with code ${error.code}.`));
+            if ('string' === typeof altCommand && !quiet) reject(new Error(`command [${altCommand}] exited with code ${error.code}. message: ${error.message}`));
+            else if ('string' === typeof altCommand) reject(new Error(`command [${altCommand}] exited with code ${error.code}.`));
+            else if (!quiet) reject(new Error(`command [${command}] exited with code ${error.code}. message: ${error.message}`));
             else reject(new Error(`command exited with code ${error.code}.`));
         } else {
             if (!quiet) console.log(stdout);

yarn.lock

@@ -3119,13 +3119,6 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
-  integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==
-  dependencies:
-    glob "^7.1.3"
-
 rsvp@^4.8.4:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"