From f4fabe19c1c1e99bf0efc980264e775e1994e214 Mon Sep 17 00:00:00 2001 From: Aeddis Date: Tue, 10 Dec 2024 22:11:34 +0100 Subject: [PATCH] build:update .woodpecker --- .woodpecker.yaml => .woodpecker/preprod.yaml | 25 +++------------ .woodpecker/release.yaml | 33 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 20 deletions(-) rename .woodpecker.yaml => .woodpecker/preprod.yaml (73%) create mode 100644 .woodpecker/release.yaml diff --git a/.woodpecker.yaml b/.woodpecker/preprod.yaml similarity index 73% rename from .woodpecker.yaml rename to .woodpecker/preprod.yaml index 1a962d9..69b762b 100644 --- a/.woodpecker.yaml +++ b/.woodpecker/preprod.yaml @@ -1,3 +1,8 @@ +when: + event: + - push + - pull_request + steps: - name: HTML syntax check image: debian:12 @@ -13,7 +18,6 @@ steps: - name: disable SEO indexing (on preprod only) when: - event: [push, pull_request] branch: preprod image: debian:12 # Same as previous step to not have to download 2 images, but it could be any linux commands: @@ -21,7 +25,6 @@ steps: - name: upload (preprod) when: - event: [push, pull_request] branch: preprod image: plugins/s3 settings: @@ -36,21 +39,3 @@ steps: target: / strip_prefix: static/ path_style: true - - - name: upload (prod) - when: - - event: push - branch: main - image: plugins/s3 - settings: - bucket: deuxfleurs.fr - endpoint: https://garage.deuxfleurs.fr - region: garage - access_key: - from_secret: aws_access_key_id - secret_key: - from_secret: aws_secret_access_key - source: static/**/* - target: / - strip_prefix: static/ - path_style: true diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml new file mode 100644 index 0000000..7397186 --- /dev/null +++ b/.woodpecker/release.yaml @@ -0,0 +1,33 @@ +when: + event: + - push + branch: + - main + +steps: + - name: HTML syntax check + image: debian:12 + # Debian has tidy 5.6.0, which complains about the "loading" tag in img. + # We need a more recent version for now. + commands: + - DEBIAN_FRONTEND=noninteractive apt update -qq + - DEBIAN_FRONTEND=noninteractive apt install -qq -y wget + - wget -q https://github.com/htacg/tidy-html5/releases/download/5.8.0/tidy-5.8.0-Linux-64bit.deb + - echo "59e594312207234f5a17455683c13c6bc47a89cb7bf994d493acfffb591d9830 tidy-5.8.0-Linux-64bit.deb" | sha256sum -c + - DEBIAN_FRONTEND=noninteractive apt install -qq -y ./tidy-5.8.0-Linux-64bit.deb + - tidy -q -e --drop-empty-elements no static/index.html + + - name: upload (prod) + image: plugins/s3 + settings: + bucket: deuxfleurs.fr + endpoint: https://garage.deuxfleurs.fr + region: garage + access_key: + from_secret: aws_access_key_id + secret_key: + from_secret: aws_secret_access_key + source: static/**/* + target: / + strip_prefix: static/ + path_style: true \ No newline at end of file