Skip to content

Commit

Permalink
fix: avoid #29 for keepFiles option (#34)
Browse files Browse the repository at this point in the history
* fix: avoid #29
* docs: update TOC
* docs: update tag to v2.4.0
  • Loading branch information
peaceiris committed Sep 24, 2019
1 parent 8eedda6 commit 380b190
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
26 changes: 14 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ 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)
- [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)
Expand Down Expand Up @@ -108,7 +109,7 @@ jobs:
run: hugo --gc --minify --cleanDestinationDir

- name: Deploy
uses: peaceiris/actions-gh-pages@v2.3.2
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down Expand Up @@ -152,8 +153,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.3.2
+ uses: docker://peaceiris/gh-pages:v2.3.2
- uses: peaceiris/actions-gh-pages@v2.4.0
+ uses: docker://peaceiris/gh-pages:v2.4.0
```

- [peaceiris/gh-pages - Docker Hub](https://hub.docker.com/r/peaceiris/gh-pages)
Expand Down Expand Up @@ -189,8 +190,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.3.2
- name: Deploy
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand All @@ -206,8 +207,8 @@ By default, existing files in the publish branch are removed before adding the o
For example:

```yaml
- name: deploy
uses: peaceiris/actions-gh-pages@v2.3.2
- name: Deploy
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand All @@ -217,6 +218,7 @@ For example:
```



## Tips and FAQ

### How to add `CNAME`
Expand Down Expand Up @@ -279,7 +281,7 @@ jobs:
npm run build
- name: deploy
uses: peaceiris/actions-gh-pages@v2.3.2
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down Expand Up @@ -327,7 +329,7 @@ jobs:
run: npm run build

- name: deploy
uses: peaceiris/actions-gh-pages@v2.3.2
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down Expand Up @@ -377,7 +379,7 @@ jobs:
run: touch ./out/.nojekyll

- name: deploy
uses: peaceiris/actions-gh-pages@v2.3.2
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down Expand Up @@ -424,7 +426,7 @@ jobs:
run: npm run generate

- name: deploy
uses: peaceiris/actions-gh-pages@v2.3.2
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down Expand Up @@ -472,7 +474,7 @@ jobs:
run: mkdocs build

- name: Deploy
uses: peaceiris/actions-gh-pages@v2.3.2
uses: peaceiris/actions-gh-pages@v2.4.0
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down
5 changes: 3 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ 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}"

print_info "Keeping existing files: ${INPUT_KEEPFILES}"
if [[ ${INPUT_KEEPFILES} != "true" ]]; then
if [[ ${INPUT_KEEPFILES} == "true" ]]; then
print_info "Keeping existing files: ${INPUT_KEEPFILES}"
else
git rm -r --ignore-unmatch '*'
fi

Expand Down

0 comments on commit 380b190

Please sign in to comment.