From aa221e3382800a5d1d0f6240ccdbdc9050aa80af Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:35:06 +0800 Subject: [PATCH 01/10] Update .yml files --- .woodpecker/.build.yml | 19 ++++++++++--------- .woodpecker/.deploy.yml | 29 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 341a2d2..24bd67b 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,13 @@ 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 diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 49d02f7..201bcd4 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -1,9 +1,17 @@ steps: - name: deploy image: alpine:3.20 - when: - - branch: master - event: push + environment: + SSH_HOST: + from_secret: SSH_HOST + PROJECT_DIRECTORY: + from_secret: PROJECT_DIRECTORY + WOODPECKER_SSH_KEY: + from_secret: WOODPECKER_SSH_KEY + REGISTRY_IMAGE_TAG: + from_secret: REGISTRY_IMAGE_TAG + DOCKER_DB_VOLUME: + from_secret: DOCKER_DB_VOLUME commands: - apk add openssh - mkdir -p /root/.ssh/ @@ -18,17 +26,10 @@ steps: docker pull "$REGISTRY_IMAGE_TAG"; docker-compose up -d; docker image prune -af;" - environment: - SSH_HOST: - from_secret: SSH_HOST - PROJECT_DIRECTORY: - from_secret: PROJECT_DIRECTORY - WOODPECKER_SSH_KEY: - from_secret: WOODPECKER_SSH_KEY - REGISTRY_IMAGE_TAG: - from_secret: REGISTRY_IMAGE_TAG - DOCKER_DB_VOLUME: - from_secret: DOCKER_DB_VOLUME + +when: + - branch: master + event: push depends_on: - build From 61759e37cdb5d3f91a05f4bc72c7d09d3d378674 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:46:14 +0800 Subject: [PATCH 02/10] Update db secret --- .woodpecker/.deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 201bcd4..646e1a4 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -10,8 +10,8 @@ steps: from_secret: WOODPECKER_SSH_KEY REGISTRY_IMAGE_TAG: from_secret: REGISTRY_IMAGE_TAG - DOCKER_DB_VOLUME: - from_secret: DOCKER_DB_VOLUME + DOCKER_VOLUME_DB: + from_secret: DOCKER_VOLUME_DB commands: - apk add openssh - mkdir -p /root/.ssh/ @@ -22,7 +22,7 @@ steps: cd "$PROJECT_DIRECTORY"; docker-compose down; docker image rm "$REGISTRY_IMAGE_TAG" || true; - docker volume rm "$DOCKER_DB_VOLUME" || true; + docker volume rm "$DOCKER_VOLUME_DB" || true; docker pull "$REGISTRY_IMAGE_TAG"; docker-compose up -d; docker image prune -af;" From a9b5bf30dd763deeebfbd3024b6294e127b9855a Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 03:59:51 +0800 Subject: [PATCH 03/10] Update ntfy step --- .woodpecker/.build.yml | 13 +++++++++++++ .woodpecker/.deploy.yml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 24bd67b..c7ca03e 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -19,6 +19,19 @@ steps: - docker push "$REGISTRY_IMAGE_TAG" volumes: - /var/run/docker.sock:/var/run/docker.sock + - name: ntfy + image: codeberg.org/l-x/woodpecker-ntfy + when: + - event: push + settings: + url: + from_secret: NTFY_URL + title: "$CI_REPO_NAME build $CI_PREV_PIPELINE_STATUS" + 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 646e1a4..6d434da 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -26,6 +26,19 @@ steps: docker pull "$REGISTRY_IMAGE_TAG"; docker-compose up -d; docker image prune -af;" + - name: ntfy + image: codeberg.org/l-x/woodpecker-ntfy + when: + - event: push + settings: + url: + from_secret: NTFY_URL + title: "$CI_REPO_NAME build $CI_PREV_PIPELINE_STATUS" + 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 5ae64a2b8e9819acc28ae93defd3d32aa72f0558 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:00:30 +0800 Subject: [PATCH 04/10] Remove duplicate .yml fields --- .woodpecker/.build.yml | 2 -- .woodpecker/.deploy.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index c7ca03e..7f377bc 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -21,8 +21,6 @@ steps: - /var/run/docker.sock:/var/run/docker.sock - 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 6d434da..8633fa7 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -28,8 +28,6 @@ steps: docker image prune -af;" - name: ntfy image: codeberg.org/l-x/woodpecker-ntfy - when: - - event: push settings: url: from_secret: NTFY_URL From 673c4903e2e8b8e13233cb925daeb6275e145d7f Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:02:14 +0800 Subject: [PATCH 05/10] 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 7f377bc..0d51661 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 8633fa7..ebe0341 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -31,7 +31,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 9e2954940f246ea659a8e94b3563dd1a86015eeb Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:14:31 +0800 Subject: [PATCH 06/10] Update .yml files --- .woodpecker/.build.yml | 10 ++++++++++ .woodpecker/.deploy.yml | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 0d51661..ac5c69c 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -30,6 +30,16 @@ steps: icon: https://blog.06222001.xyz/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 ebe0341..3e706ea 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -31,12 +31,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 tags: robot,${CI_REPO_NAME} message: ${CI_COMMIT_MESSAGE} + depends_on: deploy + - 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: deploy when: - branch: master From b632d9681b8ab3761b92db39e7029b429e6bfd96 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:16:23 +0800 Subject: [PATCH 07/10] Update .yml files --- .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 ac5c69c..f5e15cf 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -26,8 +26,8 @@ steps: from_secret: NTFY_URL title: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" priority: urgent - click: https://blog.06222001.xyz - icon: https://blog.06222001.xyz/img/logo.svg + click: https://api.template.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 diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 3e706ea..4ff16ad 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -33,8 +33,8 @@ steps: from_secret: NTFY_URL title: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" priority: urgent - click: https://blog.06222001.xyz - icon: https://blog.06222001.xyz/img/logo.svg + click: https://api.template.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 From 193f10ca250a0bccc4851f170e4c366b1d5b5e97 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:28:51 +0800 Subject: [PATCH 08/10] 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 f5e15cf..e060d5d 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://api.template.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 4ff16ad..4ceb33f 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -31,7 +31,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://api.template.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -45,7 +45,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 e0cd05e7a9a38db8ce94f8949b33792fe0152453 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:33:28 +0800 Subject: [PATCH 09/10] 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 e060d5d..f5e15cf 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://api.template.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 4ceb33f..4ff16ad 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -31,7 +31,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://api.template.06222001.xyz icon: https://github.com/woodpecker-ci/woodpecker/blob/main/docs/static/img/logo.svg @@ -45,7 +45,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 de47b1ea4b7edb0f0ebf663f7fde432ae1987c88 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 27 Mar 2025 04:47:31 +0800 Subject: [PATCH 10/10] Drop ntfy --- .woodpecker/.build.yml | 17 ++++------------- .woodpecker/.deploy.yml | 17 ++++------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index f5e15cf..4836b97 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -19,18 +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: "${CI_REPO_NAME} build ${CI_PREV_PIPELINE_STATUS}" - priority: urgent - click: https://api.template.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: @@ -38,7 +26,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}} + {{repo.name}} build #{{build.number}} {{build.status}} + {{/success}} depends_on: build when: diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 4ff16ad..3ed6af7 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -26,18 +26,6 @@ steps: docker pull "$REGISTRY_IMAGE_TAG"; docker-compose up -d; docker image prune -af;" - - name: ntfy - image: codeberg.org/l-x/woodpecker-ntfy - settings: - url: - from_secret: NTFY_URL - title: "${CI_REPO_NAME} deploy ${CI_PREV_PIPELINE_STATUS}" - priority: urgent - click: https://api.template.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: @@ -45,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}} + {{repo.name}} deployment #{{build.number}} {{build.status}} + {{/success}} depends_on: deploy when: