4d4d7b76b04536e022262e832200a83ebcd8f8de

Author
Nick Brassel <nick@tzarc.org>
Committer
GitHub <noreply@github.com>
Date

Message

[CI] Disable Discord webhook when CI run is cancelled. (#24104)

* Disable Discord webhook when CI run is cancelled.

* Include link to binaries in Discord output.

Diff

 1diff --git a/.github/workflows/ci_build_major_branch_keymap.yml b/.github/workflows/ci_build_major_branch_keymap.yml
 2index 0804c9e2d04309e4b45cd0e24121cb75c8ea1e80..2e0f3036a36538ad0d350c7ce9870ca6a43d894f 100644
 3--- a/.github/workflows/ci_build_major_branch_keymap.yml
 4+++ b/.github/workflows/ci_build_major_branch_keymap.yml
 5@@ -172,10 +172,10 @@ jobs:
 6             targets-${{ inputs.keymap }}
 7 
 8       - name: 'CI Discord Notification'
 9-        if: always()
10+        if: always() && !cancelled()
11         working-directory: util/ci/
12         env:
13           DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
14         run: |
15           python3 -m pip install -r requirements.txt
16-          python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
17+          python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --sha $(git rev-parse HEAD) --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
18diff --git a/util/ci/discord-results.py b/util/ci/discord-results.py
19index 0c09a4213a1adc803eaa26ceecaf548b71efb191..70f6af4b17ee21d00dba6173d9633d213e20a503 100755
20--- a/util/ci/discord-results.py
21+++ b/util/ci/discord-results.py
22@@ -11,6 +11,7 @@ parser = argparse.ArgumentParser(prog='discord-results.py', description='Sends a
23 parser.add_argument('-b', '--branch')
24 parser.add_argument('-k', '--keymap')
25 parser.add_argument('-u', '--url')
26+parser.add_argument('-s', '--sha')
27 args = parser.parse_args()
28 
29 qmk_dir = Path(__file__).resolve().parents[2].resolve()
30@@ -43,6 +44,7 @@ else:
31 
32 embed.add_embed_field(name='Build Target', value=f'[**{args.branch}**](https://github.com/qmk/qmk_firmware/tree/{args.branch}) / **{args.keymap}** keymap')
33 embed.add_embed_field(name='Workflow Run', value=f'[**Link**]({args.url})')
34+embed.add_embed_field(name='Firmware Binaries', value=f'[**ci.qmk.fm**](https://ci.qmk.fm/{args.branch}/{args.sha}/index.html)')
35 embed.set_timestamp()
36 
37 webhook.add_embed(embed)