From 7ae94f74bcb7245d1c46dc8e7074f8902fb6c0f3 Mon Sep 17 00:00:00 2001 From: Gitea Automation Bot Date: Sun, 3 Mar 2024 15:16:15 +1000 Subject: [PATCH] Update to use gitea-pages action --- .gitea/workflows/deploy.yml | 17 +++-------------- .zs/editthispage | 6 ++---- Dockerfile | 13 ++----------- index.md | 1 + 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 935df77..bf28227 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -5,7 +5,6 @@ name: Deploy on: push: branches: [main] - pull_request: jobs: deploy: @@ -17,17 +16,7 @@ jobs: uses: actions/setup-zs@main - name: Build site run: make build - - name: Deploy site - id: deploy - uses: actions/meli-deploy@main + - name: Publish site + uses: actions/gitea-pages@main with: - action: release - meliUrl: https://meli.mills.io - meliSiteId: ${{ secrets.MELI_SITE_ID }} - meliSiteToken: ${{ secrets.MELI_SITE_TOKEN }} - buildFolder: .pub - - name: Notify PR - uses: actions/pr-comment@main - with: - token: ${{ secrets.AUTOMATION_TOKEN }} - comment: "Site deployed to: ${{ steps.deploy.outputs.meliDeployUrl }}" + path: .pub diff --git a/.zs/editthispage b/.zs/editthispage index f9374f0..0429aae 100755 --- a/.zs/editthispage +++ b/.zs/editthispage @@ -1,7 +1,5 @@ #!/bin/sh -GITEA_BASE_URL="https://git.mills.io/prologic/zs-starter-template/_edit/main" +url="${ZS_FILE}?edit" -url="${GITEA_BASE_URL}/${ZS_FILE}" - -printf "✍️ Edit this page on Gitea." "$url" +printf "✍️ Edit this page" "$url" diff --git a/Dockerfile b/Dockerfile index c909a28..55ef833 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,8 @@ # Build FROM prologic/zs AS build -RUN mkdir -p /src - -WORKDIR /src - # Copy content -COPY . . +COPY --chown=zs . . # Build the site (in production mode) -RUN zs -p build - -# Runtime -FROM prologic/zs AS runtime - -COPY --from=build /src/.pub /data +#RUN zs -P build diff --git a/index.md b/index.md index 2d7cf56..881793b 100644 --- a/index.md +++ b/index.md @@ -8,6 +8,7 @@ This is a [zs](https://git.mills.io/prologic/zs) starter template. A live versio - A basic layout using a modified version of [bahunya][bahunya] for style - [live.js](live.js) for faster development - Examples of several built-in extensions +- Editable from within the browser! ## Quick Start