From b8232e8a2cd07a1b4346f439128c8648373e0f55 Mon Sep 17 00:00:00 2001
From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com>
Date: Thu, 15 Aug 2019 20:26:15 +0900
Subject: [PATCH] Release v0.57.0 (#8)
* migrate: GitHub Actions beta v2 (HCL to YAML)
* add: Pull Request template
* upgrade: actions
* enhance: GitHub Actions config
* update: readme
* remove: patreon image
---
.github/PULL_REQUEST_TEMPLATE.md | 3 ++
.github/main.workflow | 9 ------
.github/workflows/push.yml | 13 ++++++++
Dockerfile | 2 +-
README.md | 52 ++++++++++++++-----------------
images/patreon.jpg | Bin 3531 -> 0 bytes
6 files changed, 41 insertions(+), 38 deletions(-)
create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
delete mode 100644 .github/main.workflow
create mode 100644 .github/workflows/push.yml
delete mode 100644 images/patreon.jpg
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/)
-
-
diff --git a/images/patreon.jpg b/images/patreon.jpg
deleted file mode 100644
index 1c680522a8e28054c4ae47c1a6c84862bd90a3ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3531
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