From 7fea616a576e1e159070305d797f95fae9733f02 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 27 Dec 2020 18:48:22 +0100 Subject: [PATCH] Correct Discord webhook --- {.travis => .circleci}/are-we-d1-yet.sh | 5 +++-- .circleci/config.yml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) rename {.travis => .circleci}/are-we-d1-yet.sh (88%) diff --git a/.travis/are-we-d1-yet.sh b/.circleci/are-we-d1-yet.sh similarity index 88% rename from .travis/are-we-d1-yet.sh rename to .circleci/are-we-d1-yet.sh index 922fefdd1..0e2cfcbd7 100755 --- a/.travis/are-we-d1-yet.sh +++ b/.circleci/are-we-d1-yet.sh @@ -30,12 +30,13 @@ WEBHOOK_DATA='{ "avatar_url": "https://www.saaves.com/storage/brochure/logo-circleci-icon1583764538.png", "embeds": [ { "author": { - "name": "'"$3"' #'"$CIRCLE_WORKFLOW_JOB_ID"' (Build #'"$CIRCLE_BUILD_NUM"')", + "name": "'"$3"' (Build #'"$CIRCLE_BUILD_NUM"')", "url": "'"$CIRCLE_BUILD_URL"'", "icon_url": "https://www.saaves.com/storage/brochure/logo-circleci-icon1583764538.png" }, "title": "['"\`${CIRCLE_SHA1:0:7}\`"'] '"$COMMIT_SUBJECT"'", - "url": "'"https://github.com/$CIRCLE_PROJECT_REPONAME/$CIRCLE_PROJECT_USERNAME/commit/$CIRCLE_SHA1"'", + "url": "'"https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"'", + "description": "'"$CREDITS"'", "fields": [ { "name": "Binary accuracy", diff --git a/.circleci/config.yml b/.circleci/config.yml index 6a7102066..b98cfd2d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: docker run -v $(pwd):/root/devilution -e MAKE_BUILD=pdb diasurgical/riivaaja:stable ./devilution-comparer generate-full Diablo.exe --no-mem-disp --truncate-to-original docker run -v $(pwd):/root/devilution diasurgical/riivaaja:stable ../status.sh - .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Diablo 1.09b" + .circleci/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Diablo 1.09b" spawn_109b_diff: machine: true steps: @@ -37,7 +37,7 @@ jobs: docker run -v $(pwd):/root/devilution -e MAKE_BUILD=pdb -e SPAWN=1 diasurgical/riivaaja:stable ./devilution-comparer generate-full Diablo.exe --no-mem-disp --truncate-to-original docker run -v $(pwd):/root/devilution diasurgical/riivaaja:stable ../spawn-status.sh - .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Spawn 1.09b" + .circleci/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Spawn 1.09b" hellfire_101_diff: machine: true steps: @@ -55,7 +55,7 @@ jobs: dd if=Diablo.exe >> hellfire.exe ./devilution-comparer generate-full hellfire.exe --no-mem-disp --truncate-to-original docker run -v $(pwd):/root/devilution diasurgical/riivaaja:stable ../hellfire-status.sh - .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Hellfire 1.01" + .circleci/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Hellfire 1.01" linux: docker: - image: debian:stretch-backports