From d841f3f3d4724c84e0325e7b3a5aaac17dbe5cd8 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 02:03:14 +0800 Subject: [PATCH 01/23] Update .yml files --- .woodpecker/.build.yml | 44 ++++++++++++++++++++++++++++++++--------- .woodpecker/.deploy.yml | 32 +++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 8e5f34b..9ac87b6 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -4,15 +4,6 @@ labels: steps: - name: build image: docker - when: - - branch: master - event: push - commands: - - docker build -t "$REGISTRY_IMAGE_TAG" . - - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME" - - docker push "$REGISTRY_IMAGE_TAG" - volumes: - - /var/run/docker.sock:/var/run/docker.sock environment: FORGEJO_REGISTRY_URL: from_secret: FORGEJO_REGISTRY_URL @@ -22,3 +13,38 @@ steps: from_secret: FORGEJO_REGISTRY_PASSWORD REGISTRY_IMAGE_TAG: from_secret: REGISTRY_IMAGE_TAG + commands: + - docker build -t "$REGISTRY_IMAGE_TAG" . + - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME" + - docker push "$REGISTRY_IMAGE_TAG" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + when: + - branch: master + event: push + - name: mail_success + image: deblan/woodpecker-email" + settings: + dsn: + - from_secret: SMTP_SELFHOSTED_DSN + from: + address: + - from_secret: SMTP_SELFHOSTED_FROM_EMAIL + name: + - from_secret: SMTP_EMAIL_NAME + evaluate: 'commit.branch == "master"' + recipients: + - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 + level: success + recipients_only: false + content: + subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" + body: | + {{ commit.sha }}
+ {{ pipeline.status }}
+ {{ commit.author_email }}
+ attachments: + - log/* + when: + status: + - success diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index dc589a9..69ed4b0 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -1,9 +1,6 @@ steps: - name: deploy image: node:18-alpine - when: - - branch: master - event: push environment: CLOUDFLARE_ACCOUNT_ID: from_secret: CLOUDFLARE_ACCOUNT_ID @@ -13,3 +10,32 @@ steps: - npm install --save-dev - npm run build - npx wrangler pages deploy "./build/" --project-name blog --branch master --commit-dirty + when: + - branch: master + event: push + - name: mail_success + image: deblan/woodpecker-email" + settings: + dsn: + - from_secret: SMTP_SELFHOSTED_DSN + from: + address: + - from_secret: SMTP_SELFHOSTED_FROM_EMAIL + name: + - from_secret: SMTP_EMAIL_NAME + evaluate: 'commit.branch == "master"' + recipients: + - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 + level: success + recipients_only: false + content: + subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" + body: | + {{ commit.sha }}
+ {{ pipeline.status }}
+ {{ commit.author_email }}
+ attachments: + - log/* + when: + status: + - success From dd6daaa8e62a89d2b3ad74236b7a86e4fcc935e9 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 02:09:47 +0800 Subject: [PATCH 02/23] Update .yml files --- .woodpecker/.build.yml | 8 +++++--- .woodpecker/.deploy.yml | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 9ac87b6..7c130b2 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -35,7 +35,7 @@ steps: evaluate: 'commit.branch == "master"' recipients: - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 - level: success + level: info recipients_only: false content: subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" @@ -46,5 +46,7 @@ steps: attachments: - log/* when: - status: - - success + - branch: master + - status: + - success + - failure diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 69ed4b0..e6c734e 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -37,5 +37,7 @@ steps: attachments: - log/* when: - status: - - success + - branch: master + - status: + - success + - failure From 2a976aeeb7b06ad4fe09462fb3ab0fe00ab91860 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 02:12:16 +0800 Subject: [PATCH 03/23] Fix image typo --- .woodpecker/.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 7c130b2..3fc85cb 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -23,7 +23,7 @@ steps: - branch: master event: push - name: mail_success - image: deblan/woodpecker-email" + image: deblan/woodpecker-email settings: dsn: - from_secret: SMTP_SELFHOSTED_DSN From 35b104660d58e0e5ef6965e4aef203418fa1025b Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 02:29:24 +0800 Subject: [PATCH 04/23] Update .yml files --- .woodpecker/.build.yml | 7 ++----- .woodpecker/.deploy.yml | 9 +++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 3fc85cb..4875dbf 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -36,7 +36,7 @@ steps: recipients: - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 level: info - recipients_only: false + recipients_only: true content: subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" body: | @@ -46,7 +46,4 @@ steps: attachments: - log/* when: - - branch: master - - status: - - success - - failure + - status: [success, failure] diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index e6c734e..8673310 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -14,7 +14,7 @@ steps: - branch: master event: push - name: mail_success - image: deblan/woodpecker-email" + image: deblan/woodpecker-email settings: dsn: - from_secret: SMTP_SELFHOSTED_DSN @@ -27,7 +27,7 @@ steps: recipients: - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 level: success - recipients_only: false + recipients_only: true content: subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" body: | @@ -37,7 +37,4 @@ steps: attachments: - log/* when: - - branch: master - - status: - - success - - failure + - status: [success, failure] From 73031fb0b9715884bf7f59f227b40ecd92fd64cc Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 02:54:02 +0800 Subject: [PATCH 05/23] Add debug to .yaml files --- .woodpecker/.build.yml | 5 +++++ .woodpecker/.deploy.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 4875dbf..f744750 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -25,6 +25,7 @@ steps: - name: mail_success image: deblan/woodpecker-email settings: + debug: yes dsn: - from_secret: SMTP_SELFHOSTED_DSN from: @@ -47,3 +48,7 @@ steps: - log/* when: - status: [success, failure] + +when: + - branch: master + event: push diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 8673310..2094466 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -16,6 +16,7 @@ steps: - name: mail_success image: deblan/woodpecker-email settings: + debug: yes dsn: - from_secret: SMTP_SELFHOSTED_DSN from: @@ -38,3 +39,7 @@ steps: - log/* when: - status: [success, failure] + +when: + - branch: master + event: push From aa2798e854c15bea38b1b30f9ebe377bfc364a29 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:19:27 +0800 Subject: [PATCH 06/23] Test dsn errors --- .woodpecker/.build.yml | 3 +-- .woodpecker/.deploy.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index f744750..1a575e0 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -26,8 +26,7 @@ steps: image: deblan/woodpecker-email settings: debug: yes - dsn: - - from_secret: SMTP_SELFHOSTED_DSN + dsn: "smtp://username:password@mail.example.com:587?verify_peer=1" from: address: - from_secret: SMTP_SELFHOSTED_FROM_EMAIL diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 2094466..9fedb92 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -17,8 +17,7 @@ steps: image: deblan/woodpecker-email settings: debug: yes - dsn: - - from_secret: SMTP_SELFHOSTED_DSN + dsn: "smtp://username:password@mail.example.com:587?verify_peer=1" from: address: - from_secret: SMTP_SELFHOSTED_FROM_EMAIL From a226fc8ce59a0f845dc6ede2043b9c6c2c4a88d1 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:22:40 +0800 Subject: [PATCH 07/23] Test dsn errors --- .woodpecker/.build.yml | 4 ++-- .woodpecker/.deploy.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 1a575e0..e28cfcc 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -26,13 +26,12 @@ steps: image: deblan/woodpecker-email settings: debug: yes - dsn: "smtp://username:password@mail.example.com:587?verify_peer=1" + dsn: "gmail+smtp://username:password@default?verify_peer=1" from: address: - from_secret: SMTP_SELFHOSTED_FROM_EMAIL name: - from_secret: SMTP_EMAIL_NAME - evaluate: 'commit.branch == "master"' recipients: - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 level: info @@ -46,6 +45,7 @@ steps: attachments: - log/* when: + - branch: master - status: [success, failure] when: diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 9fedb92..d9d49d4 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -17,13 +17,12 @@ steps: image: deblan/woodpecker-email settings: debug: yes - dsn: "smtp://username:password@mail.example.com:587?verify_peer=1" + dsn: "gmail+smtp://username:password@default?verify_peer=1" from: address: - from_secret: SMTP_SELFHOSTED_FROM_EMAIL name: - from_secret: SMTP_EMAIL_NAME - evaluate: 'commit.branch == "master"' recipients: - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 level: success @@ -37,6 +36,7 @@ steps: attachments: - log/* when: + - branch: master - status: [success, failure] when: From 19f6e8e6f34b1348c11b07542f2c1c39d4774f86 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:24:15 +0800 Subject: [PATCH 08/23] Test dsn errors --- .woodpecker/.build.yml | 2 +- .woodpecker/.deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index e28cfcc..4a76f91 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -26,7 +26,7 @@ steps: image: deblan/woodpecker-email settings: debug: yes - dsn: "gmail+smtp://username:password@default?verify_peer=1" + dsn: gmail+smtp://username:password@default?verify_peer=1 from: address: - from_secret: SMTP_SELFHOSTED_FROM_EMAIL diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index d9d49d4..a488c00 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -17,7 +17,7 @@ steps: image: deblan/woodpecker-email settings: debug: yes - dsn: "gmail+smtp://username:password@default?verify_peer=1" + dsn: gmail+smtp://username:password@default?verify_peer=1 from: address: - from_secret: SMTP_SELFHOSTED_FROM_EMAIL From b003e10c7bc6850480722e6b8682e6e72e527158 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:31:01 +0800 Subject: [PATCH 09/23] Revert .yml files as email plugin is broken --- .woodpecker/.build.yml | 25 ------------------------- .woodpecker/.deploy.yml | 25 ------------------------- 2 files changed, 50 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 4a76f91..7baec1d 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -22,31 +22,6 @@ steps: when: - branch: master event: push - - name: mail_success - image: deblan/woodpecker-email - settings: - debug: yes - dsn: gmail+smtp://username:password@default?verify_peer=1 - from: - address: - - from_secret: SMTP_SELFHOSTED_FROM_EMAIL - name: - - from_secret: SMTP_EMAIL_NAME - recipients: - - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 - level: info - recipients_only: true - content: - subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" - body: | - {{ commit.sha }}
- {{ pipeline.status }}
- {{ commit.author_email }}
- attachments: - - log/* - when: - - branch: master - - status: [success, failure] when: - branch: master diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index a488c00..0cf02b8 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -13,31 +13,6 @@ steps: when: - branch: master event: push - - name: mail_success - image: deblan/woodpecker-email - settings: - debug: yes - dsn: gmail+smtp://username:password@default?verify_peer=1 - from: - address: - - from_secret: SMTP_SELFHOSTED_FROM_EMAIL - name: - - from_secret: SMTP_EMAIL_NAME - recipients: - - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1 - level: success - recipients_only: true - content: - subject: "[{{ pipeline.status }}] {{ repo.full_name }} ({{ commit.branch }} - {{ commit.sha[0:8] }}" - body: | - {{ commit.sha }}
- {{ pipeline.status }}
- {{ commit.author_email }}
- attachments: - - log/* - when: - - branch: master - - status: [success, failure] when: - branch: master From c3e1eca5a6874121a51f2391be0cf123d94e8925 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:54:45 +0800 Subject: [PATCH 10/23] Add ntfy step --- .woodpecker/.build.yml | 18 ++++++++++++++++++ .woodpecker/.deploy.yml | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 7baec1d..5f5bfe8 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -22,6 +22,24 @@ steps: when: - branch: master event: push + - name: ntfy + image: codeberg.org/l-x/woodpecker-ntfy + when: + - event: push + settings: + url: + from_secret: NTFY_URL + title: > + {{#success build.status}} + Blog image build succeeded + {{else}} + Blog image build failed + {{/success}} + priority: urgent + click: https://blog.06222001.xyz + icon: https://blog.06222001.xyz/img/logo.svg + tags: robot,${CI_REPO_NAME} + message: ${CI_COMMIT_MESSAGE} when: - branch: master diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 0cf02b8..ab17fa7 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -13,6 +13,24 @@ steps: when: - branch: master event: push + - name: ntfy + image: codeberg.org/l-x/woodpecker-ntfy + when: + - event: push + settings: + url: + from_secret: NTFY_URL + title: > + {{#success build.status}} + Blog deployment succeeded + {{else}} + Blog deployment failed + {{/success}} + priority: urgent + click: https://blog.06222001.xyz + icon: https://blog.06222001.xyz/img/logo.svg + tags: robot,${CI_REPO_NAME} + message: ${CI_COMMIT_MESSAGE} when: - branch: master From b24416e3ab101b496efff11da130ec9b345e05e3 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:59:27 +0800 Subject: [PATCH 11/23] Update ntfy step --- .woodpecker/.build.yml | 7 +------ .woodpecker/.deploy.yml | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 5f5bfe8..598f513 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -29,12 +29,7 @@ steps: settings: url: from_secret: NTFY_URL - title: > - {{#success build.status}} - Blog image build succeeded - {{else}} - Blog image build failed - {{/success}} + title: "$CI_REPO_NAME build $CI_PREV_PIPELINE_STATUS" priority: urgent click: https://blog.06222001.xyz icon: https://blog.06222001.xyz/img/logo.svg diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index ab17fa7..fc5f3a7 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -20,12 +20,7 @@ steps: settings: url: from_secret: NTFY_URL - title: > - {{#success build.status}} - Blog deployment succeeded - {{else}} - Blog deployment failed - {{/success}} + title: "$CI_REPO_NAME build $CI_PREV_PIPELINE_STATUS" priority: urgent click: https://blog.06222001.xyz icon: https://blog.06222001.xyz/img/logo.svg From 259628591d87978d573dd9cf0dbdb46ad6ec5ed6 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:00:43 +0800 Subject: [PATCH 12/23] Remove duplicate .yml steps --- .woodpecker/.build.yml | 5 ----- .woodpecker/.deploy.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 598f513..9252913 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -19,13 +19,8 @@ steps: - docker push "$REGISTRY_IMAGE_TAG" volumes: - /var/run/docker.sock:/var/run/docker.sock - when: - - branch: master - event: push - name: ntfy image: codeberg.org/l-x/woodpecker-ntfy - when: - - event: push settings: url: from_secret: NTFY_URL diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index fc5f3a7..29a4403 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -10,13 +10,8 @@ steps: - npm install --save-dev - npm run build - npx wrangler pages deploy "./build/" --project-name blog --branch master --commit-dirty - when: - - branch: master - event: push - name: ntfy image: codeberg.org/l-x/woodpecker-ntfy - when: - - event: push settings: url: from_secret: NTFY_URL From c22a31747c4dfbcd8b699b93bee6c439c5314758 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:01:44 +0800 Subject: [PATCH 13/23] Update ntfy step --- .woodpecker/.build.yml | 2 +- .woodpecker/.deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 9252913..a696876 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -24,7 +24,7 @@ steps: settings: url: from_secret: NTFY_URL - title: "$CI_REPO_NAME build $CI_PREV_PIPELINE_STATUS" + title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" priority: urgent click: https://blog.06222001.xyz icon: https://blog.06222001.xyz/img/logo.svg diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 29a4403..cf4be17 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -15,7 +15,7 @@ steps: settings: url: from_secret: NTFY_URL - title: "$CI_REPO_NAME build $CI_PREV_PIPELINE_STATUS" + title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" priority: urgent click: https://blog.06222001.xyz icon: https://blog.06222001.xyz/img/logo.svg From b9c5840afe398f9644bcf58ec9cb1c9fcb2f6bd0 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:20:00 +0800 Subject: [PATCH 14/23] Update ntfy step --- .woodpecker/.build.yml | 12 +++++++++++- .woodpecker/.deploy.yml | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index a696876..c08c05a 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -27,9 +27,19 @@ steps: title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" priority: urgent click: https://blog.06222001.xyz - icon: https://blog.06222001.xyz/img/logo.svg + icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg tags: robot,${CI_REPO_NAME} message: ${CI_COMMIT_MESSAGE} + depends_on: build + - name: discord + image: appleboy/drone-discord + settings: + webhook_id: + from_secret: DISCORD_WEBHOOK_ID + webhook_token: + from_secret: DISCORD_WEBHOOK_TOKEN + message: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" + depends_on: build when: - branch: master diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index cf4be17..2993c87 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -15,12 +15,22 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" + title: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" priority: urgent click: https://blog.06222001.xyz - icon: https://blog.06222001.xyz/img/logo.svg + icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg tags: robot,${CI_REPO_NAME} message: ${CI_COMMIT_MESSAGE} + depends_on: build + - name: discord + image: appleboy/drone-discord + settings: + webhook_id: + from_secret: DISCORD_WEBHOOK_ID + webhook_token: + from_secret: DISCORD_WEBHOOK_TOKEN + message: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" + depends_on: build when: - branch: master From 0fe627d6d427ff1bcf9e93864a1dbeca51d3fda0 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:21:22 +0800 Subject: [PATCH 15/23] Fix broken step dependency --- .woodpecker/.deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 2993c87..88c18bc 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -21,7 +21,7 @@ steps: icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg tags: robot,${CI_REPO_NAME} message: ${CI_COMMIT_MESSAGE} - depends_on: build + depends_on: deploy - name: discord image: appleboy/drone-discord settings: @@ -30,7 +30,7 @@ steps: webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN message: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" - depends_on: build + depends_on: deploy when: - branch: master From 20bf73f602d319a96002a3a73e509783b4a224be Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:25:29 +0800 Subject: [PATCH 16/23] Add git to package dependency --- .woodpecker/.deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 88c18bc..6ec018e 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -7,6 +7,7 @@ steps: CLOUDFLARE_API_TOKEN: from_secret: CLOUDFLARE_API_TOKEN commands: + - apk add git - npm install --save-dev - npm run build - npx wrangler pages deploy "./build/" --project-name blog --branch master --commit-dirty From ae48df0b940351171c6aca6a7e32f649b538c1e6 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:28:26 +0800 Subject: [PATCH 17/23] Fix incorrect message --- .woodpecker/.build.yml | 4 ++-- .woodpecker/.deploy.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index c08c05a..2fe75fc 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -24,7 +24,7 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" + title: "${CI_REPO_NAME} build ${build.status}" priority: urgent click: https://blog.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -38,7 +38,7 @@ steps: from_secret: DISCORD_WEBHOOK_ID webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN - message: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" + message: "${CI_REPO_NAME} build ${build.status}" depends_on: build when: diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 6ec018e..fa203d8 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -16,7 +16,7 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" + title: "${CI_REPO_NAME} deploy ${build.status}" priority: urgent click: https://blog.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -30,7 +30,7 @@ steps: from_secret: DISCORD_WEBHOOK_ID webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN - message: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" + message: "${CI_REPO_NAME} deploy ${build.status}" depends_on: deploy when: From dac6796cc6b51b7d56cdf2203927483dfd2c30d1 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:32:52 +0800 Subject: [PATCH 18/23] Revert message --- .woodpecker/.build.yml | 4 ++-- .woodpecker/.deploy.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 2fe75fc..c08c05a 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -24,7 +24,7 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} build ${build.status}" + title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" priority: urgent click: https://blog.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -38,7 +38,7 @@ steps: from_secret: DISCORD_WEBHOOK_ID webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN - message: "${CI_REPO_NAME} build ${build.status}" + message: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" depends_on: build when: diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index fa203d8..6ec018e 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -16,7 +16,7 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} deploy ${build.status}" + title: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" priority: urgent click: https://blog.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -30,7 +30,7 @@ steps: from_secret: DISCORD_WEBHOOK_ID webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN - message: "${CI_REPO_NAME} deploy ${build.status}" + message: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" depends_on: deploy when: From 2a2b47c6e456306c8ae442908d72cb9ca2ed19cc Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:37:52 +0800 Subject: [PATCH 19/23] Update .yml files --- .woodpecker/.build.yml | 10 ++++++++-- .woodpecker/.deploy.yml | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index c08c05a..7ede8bc 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -24,7 +24,10 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" + title: > + {{#success build.status}} + {CI_REPO_NAME} build {{build.number}} {{build.status}} + {{/success}} priority: urgent click: https://blog.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -38,7 +41,10 @@ steps: from_secret: DISCORD_WEBHOOK_ID webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN - message: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" + message: > + {{#success build.status}} + {CI_REPO_NAME} build {{build.number}} {{build.status}} + {{/success}} depends_on: build when: diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 6ec018e..d189273 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -16,7 +16,10 @@ steps: settings: url: from_secret: NTFY_URL - title: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" + title: > + {{#success build.status}} + {CI_REPO_NAME} deploy {{build.number}} {{build.status}} + {{/success}} priority: urgent click: https://blog.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -30,7 +33,10 @@ steps: from_secret: DISCORD_WEBHOOK_ID webhook_token: from_secret: DISCORD_WEBHOOK_TOKEN - message: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" + message: > + {{#success build.status}} + {CI_REPO_NAME} deploy {{build.number}} {{build.status}} + {{/success}} depends_on: deploy when: From 0bcc628b2e6f026bd1283d5ea02fc927a382719e Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:39:56 +0800 Subject: [PATCH 20/23] Drop ntfy --- .woodpecker/.build.yml | 15 --------------- .woodpecker/.deploy.yml | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 7ede8bc..2929cbd 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -19,21 +19,6 @@ steps: - docker push "$REGISTRY_IMAGE_TAG" volumes: - /var/run/docker.sock:/var/run/docker.sock - - name: ntfy - image: codeberg.org/l-x/woodpecker-ntfy - settings: - url: - from_secret: NTFY_URL - title: > - {{#success build.status}} - {CI_REPO_NAME} build {{build.number}} {{build.status}} - {{/success}} - priority: urgent - click: https://blog.06222001.xyz - icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg - tags: robot,${CI_REPO_NAME} - message: ${CI_COMMIT_MESSAGE} - depends_on: build - name: discord image: appleboy/drone-discord settings: diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index d189273..91e533c 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -11,21 +11,6 @@ steps: - npm install --save-dev - npm run build - npx wrangler pages deploy "./build/" --project-name blog --branch master --commit-dirty - - name: ntfy - image: codeberg.org/l-x/woodpecker-ntfy - settings: - url: - from_secret: NTFY_URL - title: > - {{#success build.status}} - {CI_REPO_NAME} deploy {{build.number}} {{build.status}} - {{/success}} - priority: urgent - click: https://blog.06222001.xyz - icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg - tags: robot,${CI_REPO_NAME} - message: ${CI_COMMIT_MESSAGE} - depends_on: deploy - name: discord image: appleboy/drone-discord settings: From 7b230df7b5202836cf1c8923186746a1b93e9cbc Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:41:32 +0800 Subject: [PATCH 21/23] Update .yml files --- .woodpecker/.build.yml | 2 +- .woodpecker/.deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 2929cbd..d3b8f05 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -28,7 +28,7 @@ steps: from_secret: DISCORD_WEBHOOK_TOKEN message: > {{#success build.status}} - {CI_REPO_NAME} build {{build.number}} {{build.status}} + {{CI_REPO_NAME}} build {{build.number}} {{build.status}} {{/success}} depends_on: build diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 91e533c..a6b4906 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -20,7 +20,7 @@ steps: from_secret: DISCORD_WEBHOOK_TOKEN message: > {{#success build.status}} - {CI_REPO_NAME} deploy {{build.number}} {{build.status}} + {{CI_REPO_NAME}} deploy {{build.number}} {{build.status}} {{/success}} depends_on: deploy From 0270950fe0230bf5eee29e84d3985d4d0b37e9c3 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:44:50 +0800 Subject: [PATCH 22/23] Update .yml files --- .woodpecker/.build.yml | 2 +- .woodpecker/.deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index d3b8f05..7de4983 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -28,7 +28,7 @@ steps: from_secret: DISCORD_WEBHOOK_TOKEN message: > {{#success build.status}} - {{CI_REPO_NAME}} build {{build.number}} {{build.status}} + {{repo.name}} build #{{build.number}} {{build.status}} : Branch {{build.branch}} Git ref {{build.ref}} {{/success}} depends_on: build diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index a6b4906..577ae54 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -20,7 +20,7 @@ steps: from_secret: DISCORD_WEBHOOK_TOKEN message: > {{#success build.status}} - {{CI_REPO_NAME}} deploy {{build.number}} {{build.status}} + {{repo.name}} deployment #{{build.number}} {{build.status}} : Branch {{build.branch}} Git ref {{build.ref}} {{/success}} depends_on: deploy From c20c16b579473dd12e6784a1f42df445cc2b4f2a Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:46:33 +0800 Subject: [PATCH 23/23] Update .yml files --- .woodpecker/.build.yml | 2 +- .woodpecker/.deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 7de4983..14d4267 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -28,7 +28,7 @@ steps: from_secret: DISCORD_WEBHOOK_TOKEN message: > {{#success build.status}} - {{repo.name}} build #{{build.number}} {{build.status}} : Branch {{build.branch}} Git ref {{build.ref}} + {{repo.name}} build #{{build.number}} {{build.status}} {{/success}} depends_on: build diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 577ae54..39aa30c 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -20,7 +20,7 @@ steps: from_secret: DISCORD_WEBHOOK_TOKEN message: > {{#success build.status}} - {{repo.name}} deployment #{{build.number}} {{build.status}} : Branch {{build.branch}} Git ref {{build.ref}} + {{repo.name}} deployment #{{build.number}} {{build.status}} {{/success}} depends_on: deploy