feat: Add print_error

.github/workflows/docker-image-ci.yml

@@ -1,9 +1,12 @@
 name: docker image ci
 
 on:
-  pull_request:
-    types: [opened, synchronize]
   push:
+    paths:
+    - '**'
+    - '!LICENSE'
+    - '!README.md'
+    - '!images'
 
 jobs:
   test:

README.md

@@ -28,8 +28,6 @@ Table of Contents
     - [⭐️ `PERSONAL_TOKEN`](#%EF%B8%8F-personal_token)
     - [⭐️ `GITHUB_TOKEN`](#%EF%B8%8F-github_token)
     - [⭐️ Suppressing empty commits](#%EF%B8%8F-suppressing-empty-commits)
-    - [⭐️ Keeping existing files](#%EF%B8%8F-keeping-existing-files)
-    - [⭐️ Deploy to external repository](#%EF%B8%8F-deploy-to-external-repository)
 - [Tips and FAQ](#tips-and-faq)
   - [How to add `CNAME`](#how-to-add-cname)
   - [Deployment completed but you cannot read](#deployment-completed-but-you-cannot-read)
@@ -98,19 +96,17 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@master
-      # with:
-      #   submodules: true
 
     - name: Setup Hugo
-      uses: peaceiris/actions-hugo@v2.2.1
+      uses: peaceiris/actions-hugo@v2.2.0
       with:
-        hugo-version: '0.58.3'
+        hugo-version: '0.58.2'
 
     - name: Build
       run: hugo --gc --minify --cleanDestinationDir
 
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v2.4.0
+      uses: peaceiris/actions-gh-pages@v2.3.1
       env:
         ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         PUBLISH_BRANCH: gh-pages
@@ -154,8 +150,8 @@ You can pull a public docker image from Docker Hub.
 By pulling docker images, you can reduce the overall execution time of your workflow. In addition, `latest` tag is provided.
 
 ```diff
-- uses: peaceiris/actions-gh-pages@v2.4.0
-+ uses: docker://peaceiris/gh-pages:v2.4.0
+- uses: peaceiris/actions-gh-pages@v2.3.1
++ uses: docker://peaceiris/gh-pages:v2.3.1
 ```
 
 - [peaceiris/gh-pages - Docker Hub](https://hub.docker.com/r/peaceiris/gh-pages)
@@ -191,8 +187,8 @@ By default, a commit will always be generated and pushed to the `PUBLISH_BRANCH`
 For example:
 
 ```yaml
-- name: Deploy
-  uses: peaceiris/actions-gh-pages@v2.4.0
+- name: deploy
+  uses: peaceiris/actions-gh-pages@v2.3.1
   env:
     ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
     PUBLISH_BRANCH: gh-pages
@@ -201,44 +197,6 @@ For example:
     emptyCommits: false
 ```
 
-#### ⭐️ Keeping existing 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 `keepFiles` to `true`.
-
-For example:
-
-```yaml
-- name: Deploy
-  uses: peaceiris/actions-gh-pages@v2.4.0
-  env:
-    ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-    PUBLISH_BRANCH: gh-pages
-    PUBLISH_DIR: ./public
-  with:
-    keepFiles: true
-```
-
-#### ⭐️ Deploy to 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>`.
-
-For example:
-
-```yaml
-- name: Deploy
-  uses: peaceiris/actions-gh-pages@v2.4.0
-  env:
-    ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-    EXTERNAL_REPOSITORY: username/username.github.io
-    PUBLISH_BRANCH: master
-    PUBLISH_DIR: ./public
-```
-
-You can use `ACTIONS_DEPLOY_KEY` or `PERSONAL_TOKEN`. When you use `ACTIONS_DEPLOY_KEY`, set your private key to the repository which includes this action and set your public key to your external repository.
-
-Be careful, `GITHUB_TOKEN` has no permission to access to external repositories.
-
-
 
 ## Tips and FAQ
 
@@ -302,7 +260,7 @@ jobs:
         npm run build
 
     - name: deploy
-      uses: peaceiris/actions-gh-pages@v2.4.0
+      uses: peaceiris/actions-gh-pages@v2.3.1
       env:
         ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         PUBLISH_BRANCH: gh-pages
@@ -350,7 +308,7 @@ jobs:
       run: npm run build
 
     - name: deploy
-      uses: peaceiris/actions-gh-pages@v2.4.0
+      uses: peaceiris/actions-gh-pages@v2.3.1
       env:
         ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         PUBLISH_BRANCH: gh-pages
@@ -400,7 +358,7 @@ jobs:
       run: touch ./out/.nojekyll
 
     - name: deploy
-      uses: peaceiris/actions-gh-pages@v2.4.0
+      uses: peaceiris/actions-gh-pages@v2.3.1
       env:
         ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         PUBLISH_BRANCH: gh-pages
@@ -447,7 +405,7 @@ jobs:
       run: npm run generate
 
     - name: deploy
-      uses: peaceiris/actions-gh-pages@v2.4.0
+      uses: peaceiris/actions-gh-pages@v2.3.1
       env:
         ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         PUBLISH_BRANCH: gh-pages
@@ -495,7 +453,7 @@ jobs:
       run: mkdocs build
 
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v2.4.0
+      uses: peaceiris/actions-gh-pages@v2.3.1
       env:
         ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         PUBLISH_BRANCH: gh-pages

action.yml

@@ -12,7 +12,3 @@ inputs:
     description: 'If empty commits should be made to the publication branch'
     required: false
     default: 'true'
-  keepFiles:
-    description: 'If existing files in the publish branch should be not removed before deploying'
-    required: false
-    default: 'false'

entrypoint.sh

@@ -11,19 +11,7 @@ function print_info() {
     echo -e "\e[36mINFO: ${1}\e[m"
 }
 
-function skip() {
-    print_info "No changes detected, skipping deployment"
-    exit 0
-}
-
 # check values
-if [ -n "${EXTERNAL_REPOSITORY}" ]; then
-    PUBLISH_REPOSITORY=${EXTERNAL_REPOSITORY}
-else
-    PUBLISH_REPOSITORY=${GITHUB_REPOSITORY}
-fi
-print_info "Deploy to ${PUBLISH_REPOSITORY}"
-
 if [ -n "${ACTIONS_DEPLOY_KEY}" ]; then
 
     print_info "setup with ACTIONS_DEPLOY_KEY"
@@ -33,25 +21,20 @@ if [ -n "${ACTIONS_DEPLOY_KEY}" ]; then
     echo "${ACTIONS_DEPLOY_KEY}" > /root/.ssh/id_rsa
     chmod 400 /root/.ssh/id_rsa
 
-    remote_repo="git@github.com:${PUBLISH_REPOSITORY}.git"
+    remote_repo="git@github.com:${GITHUB_REPOSITORY}.git"
 
 elif [ -n "${PERSONAL_TOKEN}" ]; then
 
     print_info "setup with PERSONAL_TOKEN"
 
-    remote_repo="https://x-access-token:${PERSONAL_TOKEN}@github.com/${PUBLISH_REPOSITORY}.git"
+    remote_repo="https://x-access-token:${PERSONAL_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
 
 elif [ -n "${GITHUB_TOKEN}" ]; then
 
     print_info "setup with GITHUB_TOKEN"
     print_error "Do not use GITHUB_TOKEN, See #9"
 
-    if [ -n "${EXTERNAL_REPOSITORY}" ]; then
-        print_error "can not use GITHUB_TOKEN to deploy to a external repository"
-        exit 1
-    fi
-
-    remote_repo="https://x-access-token:${GITHUB_TOKEN}@github.com/${PUBLISH_REPOSITORY}.git"
+    remote_repo="https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
 
 else
     print_error "not found ACTIONS_DEPLOY_KEY, PERSONAL_TOKEN, or GITHUB_TOKEN"
@@ -73,13 +56,7 @@ remote_branch="${PUBLISH_BRANCH}"
 local_dir="${HOME}/$(tr -cd 'a-f0-9' < /dev/urandom | head -c 32)"
 if git clone --depth=1 --single-branch --branch "${remote_branch}" "${remote_repo}" "${local_dir}"; then
     cd "${local_dir}"
-
-    if [[ ${INPUT_KEEPFILES} == "true" ]]; then
-        print_info "Keeping existing files: ${INPUT_KEEPFILES}"
-    else
-        git rm -r --ignore-unmatch '*'
-    fi
-
+    git rm -r --ignore-unmatch '*'
     find "${GITHUB_WORKSPACE}/${PUBLISH_DIR}" -maxdepth 1 | \
         tail -n +2 | \
         xargs -I % cp -rf % "${local_dir}/"
@@ -99,7 +76,9 @@ git add --all
 print_info "Allowing empty commits: ${INPUT_EMPTYCOMMITS}"
 COMMIT_MESSAGE="Automated deployment: $(date -u) ${GITHUB_SHA}"
 if [[ ${INPUT_EMPTYCOMMITS} == "false" ]]; then
-    git commit -m "${COMMIT_MESSAGE}" || skip
+    git commit -m "${COMMIT_MESSAGE}" || \
+        print_info "No changes detected, skipping deployment" && \
+        exit 0
 else
     git commit --allow-empty -m "${COMMIT_MESSAGE}"
 fi