diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 07ba4e29..7a338186 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,3 @@ - [ ] upgrade: hugo to `` - [ ] update: tag on readme -- [ ] release: `` with **master** branch +- [ ] release: from **master** branch diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c8125d85..26d7d138 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,12 +7,14 @@ on: jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@master - name: Docker build and print Hugo version if: github.event.deleted == false + env: + DOCKER_IMAGE: ${{ github.repository }}:${{ github.sha }} run: | - docker build -t peaceiris/actions-hugo . && - docker run peaceiris/actions-hugo:latest version || - (echo -e "\e[31mfailed to build\e[m" && exit 1) + docker build . --file Dockerfile --tag ${DOCKER_IMAGE} && + docker run ${DOCKER_IMAGE} version || + (echo -e "\e[31m[${GITHUB_WORKFLOW}] failed to build\e[m" && exit 1) diff --git a/Dockerfile b/Dockerfile index 5b3039c5..da160b36 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.57.1' +ENV HUGO_VERSION='0.57.2' 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 c5ea240c..6a0c6294 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![license](https://img.shields.io/github/license/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/blob/master/LICENSE) [![release](https://img.shields.io/github/release/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/releases/latest) [![GitHub release date](https://img.shields.io/github/release-date/peaceiris/actions-hugo.svg)](https://github.com/peaceiris/actions-hugo/releases) +[![GitHub Actions status](https://github.com/peaceiris/actions-hugo/workflows/Push%20workflow/badge.svg)](https://github.com/peaceiris/actions-hugo/actions) GitHub Actions for Hugo extended @@ -37,7 +38,7 @@ jobs: steps: - uses: actions/checkout@master - name: build - uses: peaceiris/actions-hugo@v0.57.1 + uses: peaceiris/actions-hugo@v0.57.2 with: args: --gc --minify --cleanDestinationDir - name: deploy