chore(release): 3.7.0-8

DEBIAN_FRONTEND="noninteractive"
ImageVersion="20200717.1"
GITHUB_SERVER_URL="https://github.com"
GITHUB_GRAPHQL_URL="https://api.github.com/graphql"
GITHUB_ACTOR="peaceiris"
GITHUB_REPOSITORY="actions/pages"
RUNNER_OS="Linux"
RUNNER_USER="runner"
RUNNER_TEMP="/home/runner/work/_temp"
RUNNER_WORKSPACE="/home/runner/work/pages"

.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+{
+  "name": "Node.js",
+  "image": "docker.pkg.github.com/peaceiris/actions-gh-pages/dev:latest",
+
+  // Use 'settings' to set *default* container specific settings.json values on container create.
+  "settings": {
+      "terminal.integrated.shell.linux": "/bin/bash"
+  },
+
+  // Add the IDs of extensions you want installed when the container is created in the array below.
+  "extensions": [
+      "bungcip.better-toml",
+      "EditorConfig.EditorConfig",
+      "donjayamanne.githistory",
+      "eamodio.gitlens",
+      "oderwat.indent-rainbow",
+      "yzhang.markdown-all-in-one",
+      "shd101wyy.markdown-preview-enhanced",
+      "christian-kohler.path-intellisense",
+      "lfs.vscode-emacs-friendly",
+      "dbaeumer.vscode-eslint",
+      "firsttris.vscode-jest-runner",
+      "VisualStudioExptTeam.vscodeintellicode"
+  ],
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [3000],
+
+  // Specifies a command that should be run after the container has been created.
+  "postCreateCommand": "npm ci",
+
+  // Comment out the next line to run as root instead.
+  // "remoteUser": "runner"
+}

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+# [3.7.0-8](https://github.com/peaceiris/actions-gh-pages/compare/v3.7.0-7...v3.7.0-8) (2020-08-09)
+
+
+### chore
+
+* Add vscode devcontainer ([6b302fd](https://github.com/peaceiris/actions-gh-pages/commit/6b302fdd506eb1874da1e7245b19bc66c4db0bfc))
+
+### ci
+
+* Add actions runner env (#443) ([ba912f7](https://github.com/peaceiris/actions-gh-pages/commit/ba912f746bdcba752e96a9c6731af9f9ff289f0e)), closes [#443](https://github.com/peaceiris/actions-gh-pages/issues/443)
+
+### deps
+
+* bump @types/jest from 26.0.7 to 26.0.8 (#439) ([3f71ec2](https://github.com/peaceiris/actions-gh-pages/commit/3f71ec211a08aef8dde6999c8ee81dae974a26f2)), closes [#439](https://github.com/peaceiris/actions-gh-pages/issues/439)
+* bump @types/jest from 26.0.8 to 26.0.9 (#442) ([02db90c](https://github.com/peaceiris/actions-gh-pages/commit/02db90c5c8564c8b0c1432aca1b52d66d10c7583)), closes [#442](https://github.com/peaceiris/actions-gh-pages/issues/442)
+* bump @types/node from 12.12.53 to 12.12.54 (#441) ([b5599b3](https://github.com/peaceiris/actions-gh-pages/commit/b5599b36fdd4acffdb3fb4d55bb94ac76a2b3b98)), closes [#441](https://github.com/peaceiris/actions-gh-pages/issues/441)
+
+### refactor
+
+* Enhance log (#444) ([f800244](https://github.com/peaceiris/actions-gh-pages/commit/f80024481c7939706fac36cee86324c56371d6fd)), closes [#444](https://github.com/peaceiris/actions-gh-pages/issues/444)
+
+
+
 # [3.7.0-7](https://github.com/peaceiris/actions-gh-pages/compare/v3.7.0-6...v3.7.0-7) (2020-08-02)
 
 

Dockerfile

@@ -29,13 +29,22 @@ RUN curl -o nodejs.deb "https://deb.nodesource.com/node_${NODE_VERSION%%.*}.x/po
 
 WORKDIR /repo
 
+ENV DEBIAN_FRONTEND="noninteractive"
 ENV LANG="C.UTF-8"
-ENV ImageVersion="20200625.0"
+ENV CI="true"
+ENV ImageVersion="20200717.1"
+ENV GITHUB_SERVER_URL="https://github.com"
 ENV GITHUB_API_URL="https://api.github.com"
-ENV RUNNER_TOOL_CACHE="/opt/hostedtoolcache"
+ENV GITHUB_GRAPHQL_URL="https://api.github.com/graphql"
 ENV GITHUB_REPOSITORY_OWNER="peaceiris"
 ENV GITHUB_ACTIONS="true"
-ENV CI="true"
+ENV GITHUB_ACTOR="peaceiris"
+ENV GITHUB_REPOSITORY="actions/pages"
+ENV RUNNER_OS="Linux"
+ENV RUNNER_TOOL_CACHE="/opt/hostedtoolcache"
+ENV RUNNER_USER="runner"
+ENV RUNNER_TEMP="/home/runner/work/_temp"
+ENV RUNNER_WORKSPACE="/home/runner/work/pages"
 
 RUN echo "node version: $(node -v)" && \
     echo "npm version: $(npm -v)" && \

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.7.0-7",
+  "version": "3.7.0-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1006,9 +1006,9 @@
       }
     },
     "@types/jest": {
-      "version": "26.0.7",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.7.tgz",
-      "integrity": "sha512-+x0077/LoN6MjqBcVOe1y9dpryWnfDZ+Xfo3EqGeBcfPRJlQp3Lw62RvNlWxuGv7kOEwlHriAa54updi3Jvvwg==",
+      "version": "26.0.9",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.9.tgz",
+      "integrity": "sha512-k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",
@@ -1034,9 +1034,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.12.53",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.53.tgz",
-      "integrity": "sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ=="
+      "version": "12.12.54",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz",
+      "integrity": "sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.7.0-7",
+  "version": "3.7.0-8",
   "description": "GitHub Actions for GitHub Pages",
   "main": "lib/index.js",
   "engines": {
@@ -61,7 +61,7 @@
     "@actions/io": "^1.0.2"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.7",
+    "@types/jest": "^26.0.9",
     "@types/js-yaml": "^3.12.4",
     "@types/node": "~12",
     "@typescript-eslint/eslint-plugin": "^2.34.0",

src/git-utils.ts

@@ -25,8 +25,8 @@ export async function deleteExcludedAssets(destDir: string, excludeAssets: strin
   })();
   const globber = await glob.create(excludedAssetPaths.join('\n'));
   for await (const asset of globber.globGenerator()) {
-    io.rmRF(asset);
     core.info(`[INFO] delete ${asset}`);
+    io.rmRF(asset);
   }
   return;
 }
@@ -51,8 +51,8 @@ export async function copyAssets(
     if (fs.existsSync(destPath) === false) {
       await createDir(destPath);
     }
-    await io.cp(filePublishPath, fileDestPath, copyOpts);
     core.info(`[INFO] copy ${file}`);
+    await io.cp(filePublishPath, fileDestPath, copyOpts);
   }
 
   await deleteExcludedAssets(destDir, excludeAssets);
@@ -79,6 +79,7 @@ export async function setRepo(inps: Inputs, remoteURL: string, workDir: string):
   core.info(`[INFO] ForceOrphan: ${inps.ForceOrphan}`);
   if (inps.ForceOrphan) {
     await createDir(destDir);
+    core.info(`[INFO] chdir ${workDir}`);
     process.chdir(workDir);
     await createBranchForce(inps.PublishBranch);
     await copyAssets(publishDir, destDir, inps.ExcludeAssets);
@@ -105,34 +106,28 @@ export async function setRepo(inps: Inputs, remoteURL: string, workDir: string):
     );
     if (result.exitcode === 0) {
       await createDir(destDir);
-      process.chdir(destDir);
 
-      if (inps.DestinationDir !== '') {
-        if (inps.KeepFiles) {
-          core.info('[INFO] Keep existing files');
-        } else {
-          core.info(`[INFO] clean up ${destDir}`);
-          await exec.exec('git', ['rm', '-r', '--ignore-unmatch', '*']);
-        }
+      if (inps.KeepFiles) {
+        core.info('[INFO] Keep existing files');
       } else {
-        if (inps.KeepFiles) {
-          core.info('[INFO] Keep existing files');
-        } else {
-          core.info(`[INFO] clean up ${destDir}`);
-          await exec.exec('git', ['rm', '-r', '--ignore-unmatch', '*']);
-        }
+        core.info(`[INFO] clean up ${destDir}`);
+        core.info(`[INFO] chdir ${destDir}`);
+        process.chdir(destDir);
+        await exec.exec('git', ['rm', '-r', '--ignore-unmatch', '*']);
       }
 
-      await copyAssets(publishDir, destDir, inps.ExcludeAssets);
+      core.info(`[INFO] chdir ${workDir}`);
       process.chdir(workDir);
+      await copyAssets(publishDir, destDir, inps.ExcludeAssets);
       return;
     } else {
       throw new Error(`Failed to clone remote branch ${inps.PublishBranch}`);
     }
   } catch (e) {
     core.info(`[INFO] first deployment, create new branch ${inps.PublishBranch}`);
-    core.info(e.message);
+    core.info(`[INFO] ${e.message}`);
     await createDir(destDir);
+    core.info(`[INFO] chdir ${workDir}`);
     process.chdir(workDir);
     await createBranchForce(inps.PublishBranch);
     await copyAssets(publishDir, destDir, inps.ExcludeAssets);