From f4fabe19c1c1e99bf0efc980264e775e1994e214 Mon Sep 17 00:00:00 2001 From: Aeddis Date: Tue, 10 Dec 2024 22:11:34 +0100 Subject: [PATCH 1/5] 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 -- 2.45.2 From 50f13a90644ca8057c1327d591d2e03679e68c09 Mon Sep 17 00:00:00 2001 From: aeddis Date: Tue, 10 Dec 2024 20:59:22 +0000 Subject: [PATCH 2/5] Actualiser .woodpecker.yaml --- .woodpecker/preprod.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/preprod.yaml b/.woodpecker/preprod.yaml index 69b762b..cbf3ab3 100644 --- a/.woodpecker/preprod.yaml +++ b/.woodpecker/preprod.yaml @@ -1,3 +1,4 @@ +--- when: event: - push -- 2.45.2 From 0d69a0e8c56bd4472e9b8480207d8c504462ae45 Mon Sep 17 00:00:00 2001 From: Aeddis Date: Tue, 10 Dec 2024 22:23:01 +0100 Subject: [PATCH 3/5] build: add hello world workflox --- .woodpecker/my-first-workflow.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .woodpecker/my-first-workflow.yaml diff --git a/.woodpecker/my-first-workflow.yaml b/.woodpecker/my-first-workflow.yaml new file mode 100644 index 0000000..16fb1bd --- /dev/null +++ b/.woodpecker/my-first-workflow.yaml @@ -0,0 +1,15 @@ +when: + - event: push + branch: main + +steps: + - name: build + image: debian + commands: + - echo "This is the build step" + - echo "binary-data-123" > executable + - name: a-test-step + image: golang:1.16 + commands: + - echo "Testing ..." + - ./executable \ No newline at end of file -- 2.45.2 From 41f64fb2f139cd6942557ef38bb694ba098ada33 Mon Sep 17 00:00:00 2001 From: Aeddis Date: Tue, 10 Dec 2024 22:23:51 +0100 Subject: [PATCH 4/5] remove old workflox --- .woodpecker/preprod.yaml | 42 ---------------------------------------- .woodpecker/release.yaml | 33 ------------------------------- 2 files changed, 75 deletions(-) delete mode 100644 .woodpecker/preprod.yaml delete mode 100644 .woodpecker/release.yaml diff --git a/.woodpecker/preprod.yaml b/.woodpecker/preprod.yaml deleted file mode 100644 index cbf3ab3..0000000 --- a/.woodpecker/preprod.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -when: - event: - - push - - pull_request - -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: disable SEO indexing (on preprod only) - when: - branch: preprod - image: debian:12 # Same as previous step to not have to download 2 images, but it could be any linux - commands: - - '[ -f static/robots.txt ] && echo "Disallow: /*" >> static/robots.txt' - - - name: upload (preprod) - when: - branch: preprod - image: plugins/s3 - settings: - bucket: preprod-site - 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 deleted file mode 100644 index 7397186..0000000 --- a/.woodpecker/release.yaml +++ /dev/null @@ -1,33 +0,0 @@ -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 -- 2.45.2 From b8bc7b5c1241a697530dab62d2c69562a6a3a2a6 Mon Sep 17 00:00:00 2001 From: Aeddis Date: Tue, 10 Dec 2024 22:24:54 +0100 Subject: [PATCH 5/5] test format --- .woodpecker/my-first-workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/my-first-workflow.yaml b/.woodpecker/my-first-workflow.yaml index 16fb1bd..492f4a9 100644 --- a/.woodpecker/my-first-workflow.yaml +++ b/.woodpecker/my-first-workflow.yaml @@ -1,7 +1,7 @@ +--- when: - event: push branch: main - steps: - name: build image: debian @@ -12,4 +12,4 @@ steps: image: golang:1.16 commands: - echo "Testing ..." - - ./executable \ No newline at end of file + - ./executable -- 2.45.2