Merge pull request #10 from technote-space/release/v0.0.6

Release/v0.0.6

Author: technote-space

.github/workflows/released.yml

@@ -1,5 +1,4 @@
-#on: release
-on: project_card
+on: release
 name: Released
 jobs:
   release:

__tests__/utils/misc.test.ts

@@ -166,15 +166,46 @@ describe('getWorkspace', () => {
 describe('getBuildCommands', () => {
     testEnv();
 
-    it('should get build commands', () => {
+    it('should get build commands 1', () => {
         process.env.INPUT_BUILD_COMMAND = 'test';
-        expect(getBuildCommands()).toEqual([
+        expect(getBuildCommands(path.resolve(__dirname, '..', 'fixtures', 'test4'))).toEqual([
+            'yarn install',
             'test',
+            'yarn build', // build command of package.json
+            'yarn install --production',
         ]);
     });
 
-    it('should get empty', () => {
-        expect(getBuildCommands()).toEqual([]);
+    it('should get build commands 2', () => {
+        process.env.INPUT_BUILD_COMMAND = 'yarn build';
+        expect(getBuildCommands(path.resolve(__dirname, '..', 'fixtures', 'test4'))).toEqual([
+            'yarn install',
+            'yarn build',
+            'yarn install --production',
+        ]);
+    });
+
+    it('should get build commands 3', () => {
+        process.env.INPUT_BUILD_COMMAND = 'yarn install && yarn build';
+        expect(getBuildCommands(path.resolve(__dirname, '..', 'fixtures', 'test4'))).toEqual([
+            'yarn install',
+            'yarn build',
+        ]);
+    });
+
+    it('should get build commands 4', () => {
+        process.env.INPUT_BUILD_COMMAND = 'test';
+        expect(getBuildCommands(path.resolve(__dirname, '..', 'fixtures', 'test1'))).toEqual([
+            'yarn install',
+            'test',
+            'yarn install --production',
+        ]);
+    });
+
+    it('should get build commands 5', () => {
+        expect(getBuildCommands(path.resolve(__dirname, '..', 'fixtures', 'test1'))).toEqual([
+            'yarn install --production',
+        ]);
     });
 });
 
@@ -218,15 +249,15 @@ describe('detectBuildCommand', () => {
     });
 
     it('should detect build command 1', () => {
-        expect(detectBuildCommand(path.resolve(__dirname, '..', 'fixtures', 'test4'))).toBe('test1');
+        expect(detectBuildCommand(path.resolve(__dirname, '..', 'fixtures', 'test4'))).toBe('build');
     });
 
     it('should detect build command 1', () => {
-        expect(detectBuildCommand(path.resolve(__dirname, '..', 'fixtures', 'test5'))).toBe('test2');
+        expect(detectBuildCommand(path.resolve(__dirname, '..', 'fixtures', 'test5'))).toBe('production');
     });
 
     it('should detect build command 1', () => {
-        expect(detectBuildCommand(path.resolve(__dirname, '..', 'fixtures', 'test6'))).toBe('test3');
+        expect(detectBuildCommand(path.resolve(__dirname, '..', 'fixtures', 'test6'))).toBe('prod');
     });
 });
 

src/utils/command.ts

@@ -8,7 +8,7 @@ import {getGitUrl, getRepository, getBuildCommands, getWorkspace, getCommitMessa
 export const deploy = async (branch: string, context: Context) => {
     const workDir = path.resolve(getWorkspace(), '.work');
     const buildDir = path.resolve(workDir, 'build');
-    const pushDir = path.resolve(workDir, 'build');
+    const pushDir = path.resolve(workDir, 'push');
     signale.info(`Deploying branch %s to %s`, branch, getRepository(context));
 
     fs.mkdirSync(pushDir, {recursive: true});
@@ -33,6 +33,23 @@ const cloneForBranch = async (pushDir: string, branch: string, context: Context)
 
     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'))) {
+        await gitInit(pushDir);
+        await gitCheckout(pushDir, branch);
+    }
+};
+
+const gitInit = async (pushDir: string) => {
+    signale.info('Initializing local git repo');
+
+    await execAsync(`git -C ${pushDir} init .`);
+
+};
+
+const gitCheckout = async (pushDir: string, branch: string) => {
+    signale.info('Checking out orphan branch %s', branch);
+
+    await execAsync(`git -C ${pushDir} checkout --orphan "${branch}"`);
 };
 
 const config = async (pushDir: string) => {
@@ -69,22 +86,9 @@ const cloneForBuild = async (buildDir: string, context: Context) => {
 
 const runBuild = async (buildDir: string) => {
     signale.info('=== Running build for release ===');
-    let commands = getBuildCommands();
-    const buildCommand = detectBuildCommand(buildDir);
-    const hasInstallCommand = commands.filter(command => command.includes('npm run install') || command.includes('yarn install')).length > 0;
-    if (!hasInstallCommand) {
-        commands.push('yarn install');
-    }
-    if (typeof buildCommand === 'string') {
-        commands = commands.filter(command => !buildCommand.startsWith(`npm run ${command}`) && !buildCommand.startsWith(`yarn ${command}`));
-        commands.push(`yarn ${buildCommand}`);
-    }
-    if (!hasInstallCommand) {
-        commands.push('yarn install --production');
-    }
 
     const current = process.cwd();
-    for (const command of commands) {
+    for (const command of getBuildCommands(buildDir)) {
         await execAsync(`cd ${buildDir} && ${command}`);
     }
     await execAsync(`cd ${current}`);
@@ -97,14 +101,13 @@ const copyFiles = async (buildDir: string, pushDir: string) => {
 };
 
 const execAsync = (command: string, quiet: boolean = false, altCommand: string | null = null, suppressError: boolean = false) => new Promise<string>((resolve, reject) => {
-    if (quiet && 'string' === typeof altCommand) signale.info(`Run command: ${altCommand}`);
-    if (!quiet) signale.info(`Run command: ${command}`);
+    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 (quiet) {
-                if ('string' === typeof altCommand) reject(new Error(`command [${altCommand}] exited with code ${error.code}.`));
-                else reject(new Error(`command exited with code ${error.code}.`));
-            } else reject(new Error(`command [${command}] exited with code ${error.code}.`));
+            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}.`));
+            else reject(new Error(`command exited with code ${error.code}.`));
         } else {
             if (!quiet) console.log(stdout);
             resolve(stdout);

src/utils/misc.ts

@@ -9,17 +9,34 @@ export const isTargetEvent = (context: Context): boolean => TARGET_EVENT_NAME ==
 
 export const parseConfig = (content: string): object => yaml.safeLoad(Buffer.from(content, 'base64').toString()) || {};
 
-export const getRepository = (context: Context):string => `${context.repo.owner}/${context.repo.repo}`;
+export const getRepository = (context: Context): string => `${context.repo.owner}/${context.repo.repo}`;
 
 export const getGitUrl = (context: Context): string => {
     const token = getAccessToken();
     return `https://${token}@github.com/${context.repo.owner}/${context.repo.repo}.git`;
 };
 
-export const getBuildCommands = (): string[] => {
+export const getBuildCommands = (dir: string): string[] => {
     const command = getInput('BUILD_COMMAND');
-    if ('' === command) return [];
-    return command.split('&&').map(str => str.trim().replace(/\s{2,}/g, ' '));
+    let commands = '' === command ? [] : command.split('&&').map(normalizeCommand);
+
+    const buildCommand = detectBuildCommand(dir);
+    const hasInstallCommand = commands.filter(command => command.includes('npm run install') || command.includes('yarn install')).length > 0;
+
+    if (typeof buildCommand === 'string') {
+        commands = commands.filter(command => !command.startsWith(`npm run ${buildCommand}`) && !command.startsWith(`yarn ${buildCommand}`));
+        commands.push(`yarn ${buildCommand}`);
+    }
+
+    if (!hasInstallCommand && commands.length > 0) {
+        commands.unshift('yarn install');
+    }
+
+    if (!hasInstallCommand) {
+        commands.push('yarn install --production');
+    }
+
+    return commands;
 };
 
 export const getAccessToken = (): string => getInput('ACCESS_TOKEN', {required: true});
@@ -45,8 +62,10 @@ export const detectBuildCommand = (dir: string): boolean | string => {
 
     const scripts = parsed['scripts'];
     for (const target of SEARCH_BUILD_COMMAND_TARGETS) {
-        if (target in scripts) return scripts[target].trim().replace(/\s{2,}/g, ' ');
+        if (target in scripts) return normalizeCommand(target);
     }
 
     return false;
 };
+
+const normalizeCommand = (command: string): string => command.trim().replace(/\s{2,}/g, ' ');