diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cd2b2b..bb2dc7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,10 +4,20 @@ on: push: branches: - master - tags: - - 'v*' + pull_request: + branches: + - master + merge_group: workflow_dispatch: +# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + +env: + HUB_IMAGE: jakejarvis/hugo-extended + GHCR_IMAGE: ghcr.io/jakejarvis/hugo-extended + jobs: docker: runs-on: ubuntu-latest @@ -15,33 +25,31 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - - name: Prepare tags - id: tag - env: - HUB_IMAGE: jakejarvis/hugo-extended - GHCR_IMAGE: ghcr.io/jakejarvis/hugo-extended - run: | - TAGS="${HUB_IMAGE}:latest,${GHCR_IMAGE}:latest" - - # If triggered by a new tag, add a version tag to the image - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/v} - TAGS="$TAGS,${HUB_IMAGE}:${VERSION},${GHCR_IMAGE}:${VERSION}" - fi - - # Set output parameters - echo ::set-output name=tags::${TAGS} + with: + fetch-depth: 0 - name: Set up QEMU uses: docker/setup-qemu-action@v2 - with: - platforms: linux/amd64,linux/arm64 - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub + if: ${{ github.ref == 'refs/heads/master' }} + uses: docker/login-action@v2 + with: + username: jakejarvis + password: ${{ secrets.DOCKER_HUB_TOKEN }} + + - name: Login to GitHub Container Registry + if: ${{ github.ref == 'refs/heads/master' }} + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GHCR_PAT }} + - name: Cache Docker layers uses: actions/cache@v3 with: @@ -50,33 +58,35 @@ jobs: restore-keys: | ${{ runner.os }}-buildx- - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: jakejarvis - password: ${{ secrets.DOCKER_HUB_TOKEN }} - - - name: Login to GitHub Container Registry - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GHCR_PAT }} + - name: Parse Hugo version + id: parse_version + run: | + HUGO_VERSION="$(grep -oP '(?<=^ARG HUGO_VERSION=).+$' Dockerfile)" + echo "HUGO_VERSION=$HUGO_VERSION" >> $GITHUB_OUTPUT - name: Build and push id: build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: builder: ${{ steps.buildx.outputs.name }} - context: ./ + context: . file: ./Dockerfile platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.tag.outputs.tags }} + push: ${{ github.ref == 'refs/heads/master' }} + tags: "${{ env.HUB_IMAGE }}:latest,${{ env.GHCR_IMAGE }}:latest,${{ env.HUB_IMAGE }}:${{ steps.parse_version.outputs.HUGO_VERSION }},${{ env.GHCR_IMAGE }}:${{ steps.parse_version.outputs.HUGO_VERSION }}" cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache - name: Image digest run: echo ${{ steps.build.outputs.digest }} + + - name: Update hub description + uses: peter-evans/dockerhub-description@v3 + if: ${{ github.ref == 'refs/heads/master' }} + with: + username: jakejarvis + password: ${{ secrets.DOCKER_HUB_TOKEN }} + repository: ${{ env.HUB_IMAGE }} + short-description: "✏️ Hugo Extended for x64 and ARM64 with PostCSS, Babel, Pandoc, and more baked in." + readme-filepath: ./README.md + enable-url-completion: true diff --git a/Dockerfile b/Dockerfile index ba980ca..89d0d9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG HUGO_BUILD_TAGS=extended # --- # Hugo >= v0.81.0 requires Go 1.16+ to build -FROM golang:1.19-alpine3.17 AS build +FROM golang:1.20-alpine3.17 AS build # renew global args from above # https://docs.docker.com/engine/reference/builder/#scope diff --git a/LICENSE.md b/LICENSE similarity index 100% rename from LICENSE.md rename to LICENSE diff --git a/renovate.json b/renovate.json index 2131c25..57d00b0 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,8 @@ "extends": [ "config:base" ], - "automerge": false, + "automerge": true, + "platformAutomerge": true, "regexManagers": [ { "fileMatch": [