crazy-max · Dec 27, 2019 · Dec 30, 2019 · May 1, 2020 · May 1, 2020 · May 6, 2020
Showing with 58 additions and 7 deletions.

+2 −0 action.yml

+24 −3 lib/main.js

+32 −4 src/main.ts
diff --git a/action.yml b/action.yml
@@ -12,6 +12,8 @@ inputs:
   target_branch:
     description: 'Git branch where assets will be deployed'
     default: 'gh-pages'
+  target_path:
+    description: 'Path in the target repository to deploy'
   keep_history:
     description: 'Create incremental commit instead of doing push force'
     default: 'false'

diff --git a/lib/main.js b/lib/main.js
@@ -28,6 +28,7 @@ function run() {
         try {
             const repo = core.getInput('repo') || process.env['GITHUB_REPOSITORY'] || '';
             const target_branch = core.getInput('target_branch') || 'gh-pages';
+            const target_path = core.getInput('target_path') || '.';
             const keep_history = /true/i.test(core.getInput('keep_history'));
             const allow_empty_commit = /true/i.test(core.getInput('allow_empty_commit'));
             const build_dir = core.getInput('build_dir', { required: true });
@@ -66,12 +67,27 @@ function run() {
                 yield exec.exec('git', ['init', '.']);
                 yield exec.exec('git', ['checkout', '--orphan', target_branch]);
             }
-            core.info(`🏃 Copying ${path.join(currentdir, build_dir)} contents to ${tmpdir}`);
-            fs_extra_1.copySync(path.join(currentdir, build_dir), tmpdir);
+            let target = path.join(tmpdir, ...target_path
+                .split('/')
+                .filter(x => !['refs', 'tags', 'heads'].includes(x))
+                .map(x => x.replace(/v(\d+)\.(\d+)\.([\dx]+)/, '$1.$2')));
+            core.info(`🏃 Copying ${path.join(currentdir, build_dir)} contents to ${target}`);
+            fs_extra_1.ensureDirSync(target);
+            fs_extra_1.copySync(path.join(currentdir, build_dir), target);
             if (fqdn) {
                 core.info(`✍️ Writing ${fqdn} domain name to ${path.join(tmpdir, 'CNAME')}`);
                 fs.writeFileSync(path.join(tmpdir, 'CNAME'), fqdn.trim());
             }
+            // update versions.json
+            let versions = {};
+            fs.readdirSync(path.join(tmpdir, 'docs')).forEach(loc => {
+                if (!loc.endsWith('html') && !loc.endsWith('json'))
+                    versions[loc] = fs
+                        .readdirSync(path.join(tmpdir, 'docs', loc))
+                        .filter(x => !x.endsWith('html'))
+                        .sort();
+            });
+            fs.writeFileSync(path.join(tmpdir, 'docs', 'versions.json'), JSON.stringify(versions));
             core.info(`🔨 Configuring git committer to be ${committer_name} <${committer_email}>`);
             yield exec.exec('git', ['config', 'user.name', committer_name]);
             yield exec.exec('git', ['config', 'user.email', committer_email]);
@@ -82,14 +98,19 @@ function run() {
                 core.info('⚠️ Nothing to deploy');
                 return;
             }
+            yield exec.exec('git', ['status']);
             yield exec.exec('git', ['add', '--all', '.']);
             let gitCommitCmd = [];
             gitCommitCmd.push('commit');
             if (allow_empty_commit) {
                 core.info(`✅ Allow empty commit`);
                 gitCommitCmd.push('--allow-empty');
             }
-            gitCommitCmd.push('-m', commit_message);
+            gitCommitCmd.push('-m', commit_message
+                .split('/')
+                .filter(x => !['refs', 'tags', 'heads'].includes(x))
+                .map(x => x.replace(/v(\d+)\.(\d+)\.([\dx]+)/, '$1.$2'))
+                .join('/'));
             yield exec.exec('git', gitCommitCmd);
             yield exec.exec('git', ['show', '--stat-count=10', 'HEAD']);
             let gitPushCmd = [];

diff --git a/src/main.ts b/src/main.ts
@@ -1,7 +1,7 @@
 import * as child_process from 'child_process';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
-import {copySync} from 'fs-extra';
+import {copySync, ensureDirSync} from 'fs-extra';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
@@ -10,6 +10,7 @@ async function run() {
   try {
     const repo: string = core.getInput('repo') || process.env['GITHUB_REPOSITORY'] || '';
     const target_branch: string = core.getInput('target_branch') || 'gh-pages';
+    const target_path: string = core.getInput('target_path') || '.';
     const keep_history: boolean = /true/i.test(core.getInput('keep_history'));
     const allow_empty_commit: boolean = /true/i.test(core.getInput('allow_empty_commit'));
     const build_dir: string = core.getInput('build_dir', {required: true});
@@ -51,14 +52,33 @@ async function run() {
       await exec.exec('git', ['checkout', '--orphan', target_branch]);
     }
 
-    core.info(`🏃 Copying ${path.join(currentdir, build_dir)} contents to ${tmpdir}`);
-    copySync(path.join(currentdir, build_dir), tmpdir);
+    let target = path.join(
+      tmpdir,
+      ...target_path
+        .split('/')
+        .filter(x => !['refs', 'tags', 'heads'].includes(x))
+        .map(x => x.replace(/v(\d+)\.(\d+)\.([\dx]+)/, '$1.$2'))
+    );
+    core.info(`🏃 Copying ${path.join(currentdir, build_dir)} contents to ${target}`);
+    ensureDirSync(target);
+    copySync(path.join(currentdir, build_dir), target);
 
     if (fqdn) {
       core.info(`✍️ Writing ${fqdn} domain name to ${path.join(tmpdir, 'CNAME')}`);
       fs.writeFileSync(path.join(tmpdir, 'CNAME'), fqdn.trim());
     }
 
+    // update versions.json
+    let versions = {};
+    fs.readdirSync(path.join(tmpdir, 'docs')).forEach(loc => {
+      if (!loc.endsWith('html') && !loc.endsWith('json'))
+        versions[loc] = fs
+          .readdirSync(path.join(tmpdir, 'docs', loc))
+          .filter(x => !x.endsWith('html'))
+          .sort();
+    });
+    fs.writeFileSync(path.join(tmpdir, 'docs', 'versions.json'), JSON.stringify(versions));
+
     core.info(`🔨 Configuring git committer to be ${committer_name} <${committer_email}>`);
     await exec.exec('git', ['config', 'user.name', committer_name]);
     await exec.exec('git', ['config', 'user.email', committer_email]);
@@ -70,6 +90,7 @@ async function run() {
       return;
     }
 
+    await exec.exec('git', ['status']);
     await exec.exec('git', ['add', '--all', '.']);
 
     let gitCommitCmd: Array<string> = [];
@@ -78,7 +99,14 @@ async function run() {
       core.info(`✅ Allow empty commit`);
       gitCommitCmd.push('--allow-empty');
     }
-    gitCommitCmd.push('-m', commit_message);
+    gitCommitCmd.push(
+      '-m',
+      commit_message
+        .split('/')
+        .filter(x => !['refs', 'tags', 'heads'].includes(x))
+        .map(x => x.replace(/v(\d+)\.(\d+)\.([\dx]+)/, '$1.$2'))
+        .join('/')
+    );
     await exec.exec('git', gitCommitCmd);
 
     await exec.exec('git', ['show', '--stat-count=10', 'HEAD']);