chore(release): 3.7.0-3

https://github.com/peaceiris/actions-gh-pages/issues/410#issuecomment-663507581

.github/workflows/dev-image.yml

@@ -10,16 +10,15 @@ on:
       - '.nvmrc'
       - 'Dockerfile'
       - 'Makefile'
+      - 'docker-compose.yml'
   pull_request:
-    types:
-      - opened
-      - synchronize
     paths:
       - '.github/workflows/dev-image.yml'
       - '.dockerignore'
       - '.nvmrc'
       - 'Dockerfile'
       - 'Makefile'
+      - 'docker-compose.yml'
 
 jobs:
   skipci:
@@ -34,10 +33,10 @@ jobs:
       - uses: actions/checkout@v2.3.1
       - name: Login to Packages
         run: echo '${{ secrets.GITHUB_TOKEN }}' | docker login 'docker.pkg.github.com' -u 'peaceiris' --password-stdin
-      - run: make pull
+      - run: docker-compose pull --quiet
         if: github.event_name == 'pull_request'
       - run: make build
-      - run: make cirun cmd="npm ci"
-      - run: make ciall
-      - run: make push
+      - run: make ci
+      - run: make all
+      - run: docker-compose push
         if: github.ref == 'refs/heads/main'

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
         id: nvm
 
       - name: Setup Node
-        uses: actions/setup-node@v2.1.0
+        uses: actions/setup-node@v2.1.1
         with:
           node-version: '${{ steps.nvm.outputs.NVMRC }}'
 
@@ -64,7 +64,7 @@ jobs:
           name: coverage-${{ matrix.os }}
           path: coverage
 
-      - uses: codecov/codecov-action@v1.0.11
+      - uses: codecov/codecov-action@v1.0.12
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 

CHANGELOG.md

@@ -2,6 +2,60 @@
 
 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-3](https://github.com/peaceiris/actions-gh-pages/compare/v3.7.0-2...v3.7.0-3) (2020-07-24)
+
+
+### deps
+
+* bump @types/jest from 26.0.5 to 26.0.7 (#411) ([d1700b5](https://github.com/peaceiris/actions-gh-pages/commit/d1700b565361478232daa6d66d3fe7c146b9d08f)), closes [#411](https://github.com/peaceiris/actions-gh-pages/issues/411)
+* bump @types/node from 12.12.51 to 12.12.52 (#412) ([1b5d710](https://github.com/peaceiris/actions-gh-pages/commit/1b5d710b249d09c1e229931378217c47773de8ed)), closes [#412](https://github.com/peaceiris/actions-gh-pages/issues/412)
+
+### fix
+
+* set full path of publishing assets (#413) ([6f6bb26](https://github.com/peaceiris/actions-gh-pages/commit/6f6bb2661a12d5db5d7df62962d1d28403a02860)), closes [#413](https://github.com/peaceiris/actions-gh-pages/issues/413) [/github.com/peaceiris/actions-gh-pages/issues/410#issuecomment-663507581](https://github.com//github.com/peaceiris/actions-gh-pages/issues/410/issues/issuecomment-663507581)
+
+### refactor
+
+* change message type from warning to info ([3667feb](https://github.com/peaceiris/actions-gh-pages/commit/3667febec573a36efa26505b6a712b314242991a))
+
+
+
+# [3.7.0-2](https://github.com/peaceiris/actions-gh-pages/compare/v3.7.0-1...v3.7.0-2) (2020-07-23)
+
+
+### ci
+
+* Add docker-compose.yml (#406) ([a2712f7](https://github.com/peaceiris/actions-gh-pages/commit/a2712f7b923e3e05d0f46e54fbcacef3380aca31)), closes [#406](https://github.com/peaceiris/actions-gh-pages/issues/406)
+* bump actions/setup-node from v2.1.0 to v2.1.1 (#407) ([8cd820b](https://github.com/peaceiris/actions-gh-pages/commit/8cd820bd660be6aa016923b6b35005df2fb071da)), closes [#407](https://github.com/peaceiris/actions-gh-pages/issues/407)
+* bump codecov/codecov-action from v1.0.11 to v1.0.12 (#409) ([af7aac1](https://github.com/peaceiris/actions-gh-pages/commit/af7aac10073791e2907990204f723d6b0ff902c5)), closes [#409](https://github.com/peaceiris/actions-gh-pages/issues/409)
+* remove types [skip ci] ([f633b0f](https://github.com/peaceiris/actions-gh-pages/commit/f633b0f6b54f252348cc3b10713b111caaf6f3d1))
+
+### docs
+
+* Add Code Scanning workflow badge ([99a89f6](https://github.com/peaceiris/actions-gh-pages/commit/99a89f661a291c444965018bf828995e08d7bb7b))
+* bump hugo from 0.71.1 to 0.74.2 ([ad558aa](https://github.com/peaceiris/actions-gh-pages/commit/ad558aa8bd9ad82edc7bd886159659328e6d61de))
+* change default-branch to main ([6896bd8](https://github.com/peaceiris/actions-gh-pages/commit/6896bd8b80ecc02e6c47bbcf7fc1ae0bd4d47645))
+* change master branch to default-branch (#408) ([5051105](https://github.com/peaceiris/actions-gh-pages/commit/505110527986e8c3d30694488f643d6529d0d593)), closes [#408](https://github.com/peaceiris/actions-gh-pages/issues/408)
+
+### fix
+
+* chdir to workDir after copied assets ([612f1f7](https://github.com/peaceiris/actions-gh-pages/commit/612f1f7579820dc380d265d61924f7a7d8718859)), closes [#324](https://github.com/peaceiris/actions-gh-pages/issues/324)
+
+
+
+# [3.7.0-1](https://github.com/peaceiris/actions-gh-pages/compare/v3.7.0-0...v3.7.0-1) (2020-07-21)
+
+
+### docs
+
+* Enhance section name ([3874723](https://github.com/peaceiris/actions-gh-pages/commit/3874723ac6158d13e3f1e3c8fd34e1ce96d9edf7))
+
+### fix
+
+* KeepFiles behaviour when DestinationDir has dir (#405) ([ce4e3be](https://github.com/peaceiris/actions-gh-pages/commit/ce4e3beff1ed33658f3160b0f45b688c6ea09932)), closes [#405](https://github.com/peaceiris/actions-gh-pages/issues/405) [#324](https://github.com/peaceiris/actions-gh-pages/issues/324)
+
+
+
 # [3.7.0-0](https://github.com/peaceiris/actions-gh-pages/compare/v3.6.4...v3.7.0-0) (2020-07-21)
 
 

Makefile

@@ -1,46 +1,22 @@
-cmd := "bash"
-msg := ""
 IMAGE_NAME := docker.pkg.github.com/peaceiris/actions-gh-pages/dev:latest
 NODE_VERSION := $(shell cat ./.nvmrc)
-DOCKER_RUN := docker run --rm -i -t -v ${PWD}:/repo -v ~/.gitconfig:/root/.gitconfig $(IMAGE_NAME)
-DOCKER_RUN_CI := docker run --rm -v ${PWD}:/repo $(IMAGE_NAME)
-
 
 .PHONY: build
 build:
-	docker build . \
-		--build-arg NODE_VERSION=$(NODE_VERSION) \
-		--cache-from=${IMAGE_NAME} \
-		-t $(IMAGE_NAME)
-
-.PHONY: pull
-pull:
-	docker pull ${IMAGE_NAME}
-
-.PHONY: push
-push:
-	docker push ${IMAGE_NAME}
+	docker-compose build --build-arg NODE_VERSION=$(NODE_VERSION)
 
 .PHONY: run
 run:
-	$(DOCKER_RUN) $(cmd)
+	docker-compose run --rm dev bash
 
-.PHONY: cirun
-cirun:
-	$(DOCKER_RUN_CI) $(cmd)
+.PHONY: ci
+ci:
+	docker-compose run --rm -T dev npm ci
 
 .PHONY: test
 test:
-	$(DOCKER_RUN) npm test
-
-.PHONY: commit
-commit:
-	$(DOCKER_RUN) git commit -m "$(msg)"
+	docker-compose run --rm -T dev npm test
 
 .PHONY: all
 all:
-	$(DOCKER_RUN) npm run all
-
-.PHONY: ciall
-ciall:
-	$(DOCKER_RUN_CI) npm run all
+	docker-compose run --rm -T dev npm run all

README.md

@@ -2,6 +2,7 @@
 [![release](https://img.shields.io/github/release/peaceiris/actions-gh-pages.svg)](https://github.com/peaceiris/actions-gh-pages/releases/latest)
 [![GitHub release date](https://img.shields.io/github/release-date/peaceiris/actions-gh-pages.svg)](https://github.com/peaceiris/actions-gh-pages/releases)
 ![Test](https://github.com/peaceiris/actions-gh-pages/workflows/Test/badge.svg?branch=main&event=push)
+![Code Scanning](https://github.com/peaceiris/actions-gh-pages/workflows/Code%20Scanning/badge.svg?event=push)
 [![CodeFactor](https://www.codefactor.io/repository/github/peaceiris/actions-gh-pages/badge)](https://www.codefactor.io/repository/github/peaceiris/actions-gh-pages)
 
 <img width="400" alt="GitHub Actions for deploying to GitHub Pages with Static Site Generators" src="./images/ogp.svg">
@@ -69,18 +70,18 @@ All Actions runners: Linux (Ubuntu), macOS, and Windows are supported.
   - [⭐️ Repository type - Project](#%EF%B8%8F-repository-type---project)
   - [⭐️ Repository type - User and Organization](#%EF%B8%8F-repository-type---user-and-organization)
 - [Options](#options)
-  - [⭐️ `github_token`](#%EF%B8%8F-github_token)
-  - [⭐️ `deploy_key`](#%EF%B8%8F-deploy_key)
-  - [⭐️ `personal_token`](#%EF%B8%8F-personal_token)
-  - [⭐️ `publish_branch`](#%EF%B8%8F-publish_branch)
-  - [⭐️ `publish_dir`](#%EF%B8%8F-publish_dir)
-  - [⭐️ `destination_dir`](#%EF%B8%8F-destination_dir)
-  - [⭐️ CNAME](#%EF%B8%8F-cname)
-  - [⭐️ Enable Built-in Jekyll](#%EF%B8%8F-enable-built-in-jekyll)
-  - [⭐️ Allow empty commits](#%EF%B8%8F-allow-empty-commits)
-  - [⭐️ Keeping existing files](#%EF%B8%8F-keeping-existing-files)
-  - [⭐️ Deploy to external repository](#%EF%B8%8F-deploy-to-external-repository)
-  - [⭐️ Force orphan](#%EF%B8%8F-force-orphan)
+  - [⭐️ Set Runner's Access Token `github_token`](#%EF%B8%8F-set-runners-access-token-github_token)
+  - [⭐️ Set SSH Private Key `deploy_key`](#%EF%B8%8F-set-ssh-private-key-deploy_key)
+  - [⭐️ Set Personal Access Token `personal_token`](#%EF%B8%8F-set-personal-access-token-personal_token)
+  - [⭐️ Target Branch `publish_branch`](#%EF%B8%8F-target-branch-publish_branch)
+  - [⭐️ Source Directory `publish_dir`](#%EF%B8%8F-source-directory-publish_dir)
+  - [⭐️ Deploy to Subdirectory `destination_dir`](#%EF%B8%8F-deploy-to-subdirectory-destination_dir)
+  - [⭐️ Add CNAME file `cname`](#%EF%B8%8F-add-cname-file-cname)
+  - [⭐️ Enable Built-in Jekyll `enable_jekyll`](#%EF%B8%8F-enable-built-in-jekyll-enable_jekyll)
+  - [⭐️ Allow empty commits `allow_empty_commit`](#%EF%B8%8F-allow-empty-commits-allow_empty_commit)
+  - [⭐️ Keeping existing files `keep_files`](#%EF%B8%8F-keeping-existing-files-keep_files)
+  - [⭐️ Deploy to external repository `external_repository`](#%EF%B8%8F-deploy-to-external-repository-external_repository)
+  - [⭐️ Force orphan `force_orphan`](#%EF%B8%8F-force-orphan-force_orphan)
   - [⭐️ Set Git username and email](#%EF%B8%8F-set-git-username-and-email)
   - [⭐️ Set custom commit message](#%EF%B8%8F-set-custom-commit-message)
   - [⭐️ Create Git tag](#%EF%B8%8F-create-git-tag)
@@ -112,7 +113,7 @@ All Actions runners: Linux (Ubuntu), macOS, and Windows are supported.
 
 ### ⭐️ Repository type - Project
 
-Add your workflow file `.github/workflows/gh-pages.yml` and push to the remote master branch.
+Add your workflow file `.github/workflows/gh-pages.yml` and push to the remote default branch branch.
 
 An example workflow for Hugo.
 
@@ -126,7 +127,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -140,7 +141,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.71.1'
+          hugo-version: '0.74.2'
 
       - name: Build
         run: hugo --minify
@@ -201,7 +202,7 @@ jobs:
 
 ## Options
 
-### ⭐️ `github_token`
+### ⭐️ Set Runner's Access Token `github_token`
 
 **This option is for `GITHUB_TOKEN`, not a personal access token.**
 
@@ -217,7 +218,7 @@ GitHub Actions runner automatically creates a `GITHUB_TOKEN` secret to use in yo
 
 For more details about `GITHUB_TOKEN`: [Authenticating with the GITHUB_TOKEN - GitHub Help](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token)
 
-### ⭐️ `deploy_key`
+### ⭐️ Set SSH Private Key `deploy_key`
 
 Read [Create SSH Deploy Key](#%EF%B8%8F-create-ssh-deploy-key), create your SSH deploy key, and set the `deploy_key` option like the following.
 
@@ -229,11 +230,10 @@ Read [Create SSH Deploy Key](#%EF%B8%8F-create-ssh-deploy-key), create your SSH
     publish_dir: ./public
 ```
 
-### ⭐️ `personal_token`
+### ⭐️ Set Personal Access Token `personal_token`
 
 [Generate a personal access token (`repo`)](https://github.com/settings/tokens) and add it to Secrets as `PERSONAL_TOKEN`, it works as well as `ACTIONS_DEPLOY_KEY`.
 
-
 ```yaml
 - name: Deploy
   uses: peaceiris/actions-gh-pages@v3
@@ -242,7 +242,7 @@ Read [Create SSH Deploy Key](#%EF%B8%8F-create-ssh-deploy-key), create your SSH
     publish_dir: ./public
 ```
 
-### ⭐️ `publish_branch`
+### ⭐️ Target Branch `publish_branch`
 
 A target branch to deploy to GitHub Pages. The default is `gh-pages`.
 
@@ -254,7 +254,7 @@ A target branch to deploy to GitHub Pages. The default is `gh-pages`.
     publish_branch: master  # default: gh-pages
 ```
 
-### ⭐️ `publish_dir`
+### ⭐️ Source Directory `publish_dir`
 
 A source directory to deploy to GitHub Pages. The default is `public`.
 
@@ -266,7 +266,10 @@ A source directory to deploy to GitHub Pages. The default is `public`.
     publish_dir: ./out  # default: public
 ```
 
-### ⭐️ `destination_dir`
+### ⭐️ Deploy to Subdirectory `destination_dir`
+
+*This feature is on beta.*
+*Any feedback is welcome at [Issue #324](https://github.com/peaceiris/actions-gh-pages/issues/324)*
 
 A destination subdirectory on a publishing branch. The default is empty.
 
@@ -278,7 +281,7 @@ A destination subdirectory on a publishing branch. The default is empty.
     destination_dir: subdir
 ```
 
-### ⭐️ CNAME
+### ⭐️ Add CNAME file `cname`
 
 To add `CNAME` file, we can set the `cname` option.
 
@@ -293,7 +296,7 @@ For more details about `CNAME`, read the official documentation: [Managing a cus
     cname: github.com
 ```
 
-### ⭐️ Enable Built-in Jekyll
+### ⭐️ Enable Built-in Jekyll `enable_jekyll`
 
 If you want GitHub Pages to process your site with the static site generator Jekyll, set `enable_jekyll` to true.
 
@@ -315,7 +318,7 @@ Bypassing Jekyll makes the deployment faster and is necessary if you are deployi
 
 For more details about `.nojekyll`: [Bypassing Jekyll on GitHub Pages - The GitHub Blog](https://github.blog/2009-12-29-bypassing-jekyll-on-github-pages/)
 
-### ⭐️ Allow empty commits
+### ⭐️ Allow empty commits `allow_empty_commit`
 
 By default, a commit will not be generated when no file changes. If you want to allow an empty commit, set the optional parameter `allow_empty_commit` to `true`.
 
@@ -330,7 +333,7 @@ For example:
     allow_empty_commit: true
 ```
 
-### ⭐️ Keeping existing files
+### ⭐️ Keeping existing files `keep_files`
 
 By default, existing files in the publish branch are removed before adding the ones from publish dir. If you want the action to add new files but leave existing ones untouched, set the optional parameter `keep_files` to `true`.
 
@@ -345,7 +348,7 @@ For example:
     keep_files: true
 ```
 
-### ⭐️ Deploy to external repository
+### ⭐️ Deploy to external repository `external_repository`
 
 By default, your files are published to the repository which is running this action.
 If you want to publish to another repository on GitHub, set the environment variable `external_repository` to `<username>/<external-repository>`.
@@ -374,7 +377,7 @@ A GitHub Free Plan account cannot use the GitHub Pages in a private repository.
 - `peaceiris/homepage`: A private repository running this action with `external_repository: peaceiris/peaceiris.github.io`
 - `peaceiris/peaceiris.github.io`: A public repository using GitHub Pages
 
-### ⭐️ Force orphan
+### ⭐️ Force orphan `force_orphan`
 
 We can set the `force_orphan: true` option.
 This allows you to make your publish branch with only the latest commit.
@@ -443,7 +446,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - 'v*.*.*'
 
@@ -475,7 +478,7 @@ jobs:
 Commands on a local machine.
 
 ```console
-$ # On the master branch
+$ # On a main branch
 $ git tag -a "v1.2.3" -m "Release v1.2.3"
 $ git push origin "v1.2.3"
 
@@ -483,7 +486,7 @@ $ # After deployment
 $ git fetch origin
 $ git tag
 deploy-v1.2.3  # Tag on the gh-pages branch
-v1.2.3         # Tag on the master branch
+v1.2.3         # Tag on the main branch
 ```
 
 <div align="right">
@@ -569,7 +572,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
   schedule:
     - cron: "22 22 * * *"
   workflow_dispatch:
@@ -606,7 +609,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -650,7 +653,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -698,7 +701,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -749,7 +752,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -795,7 +798,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - '.github/workflows/deploy.yml'
       - 'website/**'
@@ -852,7 +855,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -908,7 +911,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -943,7 +946,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -983,7 +986,7 @@ name: github pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:
@@ -1059,7 +1062,7 @@ name: GitHub Pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:

docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3.2'
+
+services:
+  dev:
+    image: 'docker.pkg.github.com/peaceiris/actions-gh-pages/dev:latest'
+    build:
+      context: .
+      cache_from:
+        - 'docker.pkg.github.com/peaceiris/actions-gh-pages/dev:latest'
+    container_name: peaceiris_actions_github_pages
+    volumes:
+      - ${PWD}:/repo
+    stdin_open: true
+    tty: true
+    command:
+      - bash

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.7.0-0",
+  "version": "3.7.0-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -997,9 +997,9 @@
       }
     },
     "@types/jest": {
-      "version": "26.0.5",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.5.tgz",
-      "integrity": "sha512-heU+7w8snfwfjtcj2H458aTx3m5unIToOJhx75ebHilBiiQ39OIdA18WkG4LP08YKeAoWAGvWg8s+22w/PeJ6w==",
+      "version": "26.0.7",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.7.tgz",
+      "integrity": "sha512-+x0077/LoN6MjqBcVOe1y9dpryWnfDZ+Xfo3EqGeBcfPRJlQp3Lw62RvNlWxuGv7kOEwlHriAa54updi3Jvvwg==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",
@@ -1025,9 +1025,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.12.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.51.tgz",
-      "integrity": "sha512-6ILqt8iNThALrxDv2Q4LyYFQxULQz96HKNIFd4s9QRQaiHINYeUpLqeU/2IU7YMtvipG1fQVAy//vY8/fX1Y9w=="
+      "version": "12.12.52",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.52.tgz",
+      "integrity": "sha512-oNJSI5bzuAH4f4I5JatPf4jytM6vQPWMw8JDOH68mNMyOmSqBkctHBfsyaBU3Su+dhYd8E+tDtPJWUXsyO5Msg=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",

package.json

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

src/git-utils.ts

@@ -20,8 +20,9 @@ export async function copyAssets(publishDir: string, destDir: string): Promise<v
     if (file.endsWith('.git') || file.endsWith('.github')) {
       continue;
     }
-    const filePath = path.join(publishDir, file);
-    await io.cp(filePath, `${destDir}/`, copyOpts);
+    const filePublishPath = path.join(publishDir, file);
+    const fileDestPath = path.join(destDir, file);
+    await io.cp(filePublishPath, fileDestPath, copyOpts);
     core.info(`[INFO] copy ${file}`);
   }
 
@@ -49,7 +50,6 @@ export async function setRepo(inps: Inputs, remoteURL: string, workDir: string):
     await createDir(destDir);
     process.chdir(workDir);
     await createBranchForce(inps.PublishBranch);
-    process.chdir(destDir);
     await copyAssets(publishDir, destDir);
     return;
   }
@@ -73,14 +73,27 @@ export async function setRepo(inps: Inputs, remoteURL: string, workDir: string):
       options
     );
     if (result.exitcode === 0) {
-      process.chdir(workDir);
-      if (inps.KeepFiles) {
-        core.info('[INFO] Keep existing files');
+      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', '*']);
+        }
       } else {
-        await exec.exec('git', ['rm', '-r', '--ignore-unmatch', '*']);
+        if (inps.KeepFiles) {
+          core.info('[INFO] Keep existing files');
+        } else {
+          core.info(`[INFO] clean up ${destDir}`);
+          await exec.exec('git', ['rm', '-r', '--ignore-unmatch', '*']);
+        }
       }
 
       await copyAssets(publishDir, destDir);
+      process.chdir(workDir);
       return;
     } else {
       throw new Error(`Failed to clone remote branch ${inps.PublishBranch}`);

src/utils.ts

@@ -53,7 +53,7 @@ export async function addCNAME(workDir: string, content: string): Promise<void>
   }
   const filepath = path.join(workDir, 'CNAME');
   if (fs.existsSync(filepath)) {
-    core.warning(`CNAME already exists, skip adding CNAME`);
+    core.info(`CNAME already exists, skip adding CNAME`);
     return;
   }
   fs.writeFileSync(filepath, content + '\n');