From e9d9911fdc535d796e7a34353e787db44fd5d093 Mon Sep 17 00:00:00 2001 From: surtur Date: Mon, 9 Mar 2020 07:45:23 +0100 Subject: [PATCH] revert back to old webhook (for now) --- .drone.yml | 70 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9fabe7b..ac064b7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: ENDPOINT: from_secret: dockerhub_endpoint commands: - #- curl -s -X POST $ENDPOINT + - curl -s -X POST $ENDPOINT - echo @@ -21,6 +21,10 @@ steps: kind: pipeline name: notifications +platform: + os: linux + arch: amd64 + platform: os: linux arch: amd64 @@ -28,18 +32,6 @@ platform: clone: disable: true -steps: -- name: discord - pull: always - image: curlimages/curl - environment: - webhook_id: - from_secret: discord_webhook_id - webhook_token: - from_secret: discord_webhook_token - commands: - - curl -sL -H "Content-Type:application/json" -X POST https://discordapp.com/api/webhooks/$webhook_id/$webhook_token -d '{"wait":false,"content":"drone","username":"","avatar_url":"","tts":false,"embeds":[{"title":":white_check_mark:Build ${DRONE_BUILD_NUMBER} of `${DRONE_REPO}` succeeded.","description":"event:**`${DRONE_BUILD_EVENT}`**\n\ncommit [`${DRONE_COMMIT_SHA}`](${DRONE_COMMIT_LINK}) on [`${DRONE_COMMIT_BRANCH}`](https://git.dotya.ml/${DRONE_REPO}/src/branch/${DRONE_COMMIT_BRANCH})\n${DRONE_COMMIT_MESSAGE} - ${DRONE_COMMIT_AUTHOR_NAME}\n\n[go to repo](https://${DRONE_SYSTEM_HOST}/${DRONE_REPO})","url":"https://${DRONE_SYSTEM_HOST}/${DRONE_REPO}/${DRONE_BUILD_NUMBER}","color":7506394,"footer":{"text":"drone discord webhook"},"author":{"name":"${DRONE_COMMIT_AUTHOR}","url":"https://git.dotya.ml/${DRONE_COMMIT_AUTHOR}","icon_url":""},"fields":null}]}' - - curl -sL -H "Content-Type:application/json" -X POST https://discordapp.com/api/webhooks/$webhook_id/$webhook_token -d '{"content":"Hello, World!","tts":false,"embed":{"title":"Hello, Embed!","description":"This is an embedded message."}}' trigger: branch: - master @@ -54,6 +46,58 @@ trigger: depends_on: - dockerhub-build-trigger +steps: + - name: discord + pull: always + image: appleboy/drone-discord:1.2.4 + settings: + message: "{{#success build.status}} {{commit.author}}\n✅Build #{{build.number}} of `{{repo.name}}` succeeded.\nevent: **`{{build.event}}`**\n\ncommit [`{{build.commit}}`](https://git.dotya.ml/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}) on `{{commit.branch}}`\n``` {{commit.message}} ```\n[build log]({{build.link}}) {{else}} {{commit.author}}\n❌Build #{{build.number}} of `{{repo.name}}` failed.\ncommit [`{{build.commit}}`](https://git.dotya.ml/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}) on `{{commit.branch}} on `{{commit.branch}}`:\n``` {{commit.message}} ```\n[build log]({{build.link}}) {{/success}}\n" + webhook_id: + from_secret: discord_webhook_id + webhook_token: + from_secret: discord_webhook_token + +# --- +# kind: pipeline +# name: notifications +# +# platform: + # os: linux + # arch: amd64 +# +# platform: + # os: linux + # arch: amd64 +# +# clone: + # disable: true +# +# steps: +# - name: discord + # pull: always + # image: curlimages/curl + # environment: + # webhook_id: + # from_secret: discord_webhook_id + # webhook_token: + # from_secret: discord_webhook_token + # commands: + # - curl -sL -H "Content-Type:application/json" -X POST https://discordapp.com/api/webhooks/$webhook_id/$webhook_token -d '{"wait":false,"content":"drone","username":"","avatar_url":"","tts":false,"embeds":[{"title":":white_check_mark:Build ${DRONE_BUILD_NUMBER} of `${DRONE_REPO}` succeeded.","description":"event:**`${DRONE_BUILD_EVENT}`**\n\ncommit [`${DRONE_COMMIT_SHA}`](${DRONE_COMMIT_LINK}) on [`${DRONE_COMMIT_BRANCH}`](https://git.dotya.ml/${DRONE_REPO}/src/branch/${DRONE_COMMIT_BRANCH})\n${DRONE_COMMIT_MESSAGE} - ${DRONE_COMMIT_AUTHOR_NAME}\n\n[go to repo](https://${DRONE_SYSTEM_HOST}/${DRONE_REPO})","url":"https://${DRONE_SYSTEM_HOST}/${DRONE_REPO}/${DRONE_BUILD_NUMBER}","color":7506394,"footer":{"text":"drone discord webhook"},"author":{"name":"${DRONE_COMMIT_AUTHOR}","url":"https://git.dotya.ml/${DRONE_COMMIT_AUTHOR}","icon_url":""},"fields":null}]}' + # - curl -sL -H "Content-Type:application/json" -X POST https://discordapp.com/api/webhooks/$webhook_id/$webhook_token -d '{"content":"Hello, World!","tts":false,"embed":{"title":"Hello, Embed!","description":"This is an embedded message."}}' +# trigger: + # branch: + # - master + # - "release/*" + # event: + # - push + # - tag + # status: + # - success + # - failure +# +# depends_on: + # - dockerhub-build-trigger + --- kind: pipeline