diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..5d424fc --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,3 @@ +- [ ] upgrade: hugo to `v0..` +- [ ] update: tag on readme +- [ ] release: `v0..` with **master** branch diff --git a/.github/main.workflow b/.github/main.workflow deleted file mode 100644 index c03be47..0000000 --- a/.github/main.workflow +++ /dev/null @@ -1,9 +0,0 @@ -workflow "Main workflow" { - on = "push" - resolves = ["docker-build"] -} - -action "docker-build" { - uses = "actions/docker/cli@master" - args = "build -t peaceiris/actions-hugo ." -} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..5a758dd --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,13 @@ +name: Push workflow + +on: [push] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Docker build + run: docker build -t peaceiris/actions-hugo . + - name: Check Hugo version + run: docker run peaceiris/actions-hugo:latest version diff --git a/Dockerfile b/Dockerfile index d59c7ae..f145ba0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ LABEL "repository"="https://github.com/peaceiris/actions-hugo" LABEL "homepage"="https://github.com/peaceiris/actions-hugo" LABEL "maintainer"="peaceiris" -ENV HUGO_VERSION='0.56.3' +ENV HUGO_VERSION='0.57.0' ENV HUGO_NAME="hugo_extended_${HUGO_VERSION}_Linux-64bit" ENV HUGO_URL="https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/${HUGO_NAME}.tar.gz" RUN wget "${HUGO_URL}" && \ diff --git a/README.md b/README.md index 7721f97..57b0ff1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ## Getting started -### Create `main.workflow` +### Create `.github/workflows/push.yml` An example with [GitHub Actions for deploying to GitHub Pages with Static Site Generators] @@ -23,39 +23,37 @@ An example with [GitHub Actions for deploying to GitHub Pages with Static Site G ![peaceiris/actions-hugo latest version](https://img.shields.io/github/release/peaceiris/actions-hugo.svg?label=peaceiris%2Factions-hugo) ![peaceiris/actions-gh-pages latest version](https://img.shields.io/github/release/peaceiris/actions-gh-pages.svg?label=peaceiris%2Factions-gh-pages) -```hcl -workflow "GitHub Pages" { - on = "push" - resolves = ["deploy"] -} +```yaml +name: Main workflow -action "is-branch-master" { - uses = "actions/bin/filter@master" - args = "branch master" -} +on: + push: + branches: + - master -action "build" { - needs = "is-branch-master" - uses = "peaceiris/actions-hugo@v0.56.3" - args = ["--gc", "--minify", "--cleanDestinationDir"] -} - -action "deploy" { - needs = "build" - uses = "peaceiris/actions-gh-pages@v1.0.1" - env = { - PUBLISH_DIR = "./public" - PUBLISH_BRANCH = "gh-pages" - } - secrets = ["ACTIONS_DEPLOY_KEY"] -} +jobs: + build-deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: build + uses: peaceiris/actions-hugo@v0.57.0 + with: + args: --gc --minify --cleanDestinationDir + - name: deploy + uses: peaceiris/actions-gh-pages@v1.1.0 + if: contains(github.ref, 'master') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PUBLISH_BRANCH: gh-pages + PUBLISH_DIR: ./public ``` ## License -[MIT License - peaceiris/actions-hugo] +- [MIT License - peaceiris/actions-hugo] [MIT License - peaceiris/actions-hugo]: https://github.com/peaceiris/actions-hugo/blob/master/LICENSE @@ -64,5 +62,3 @@ action "deploy" { ## About the author - [peaceiris's homepage](https://peaceiris.com/) - -peaceiris - Patreon diff --git a/images/patreon.jpg b/images/patreon.jpg deleted file mode 100644 index 1c68052..0000000 Binary files a/images/patreon.jpg and /dev/null differ