aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-07-12 00:20:05 +0000
committerQMK Bot <[email protected]>2024-07-12 00:20:05 +0000
commit57b7f8534b2e04af27e7b0002484199874aff6b1 (patch)
tree9d6352159d1281c6afbdd166d2a311229fead064
parent6051fc87e3c809802694d38b3742274eca4cf660 (diff)
parent4d4d7b76b04536e022262e832200a83ebcd8f8de (diff)
downloadqmk_firmware-57b7f8534b2e04af27e7b0002484199874aff6b1.tar.gz
qmk_firmware-57b7f8534b2e04af27e7b0002484199874aff6b1.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.github/workflows/ci_build_major_branch_keymap.yml4
-rwxr-xr-xutil/ci/discord-results.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci_build_major_branch_keymap.yml b/.github/workflows/ci_build_major_branch_keymap.yml
index 0804c9e2d0..2e0f3036a3 100644
--- a/.github/workflows/ci_build_major_branch_keymap.yml
+++ b/.github/workflows/ci_build_major_branch_keymap.yml
@@ -172,10 +172,10 @@ jobs:
targets-${{ inputs.keymap }}
- name: 'CI Discord Notification'
- if: always()
+ if: always() && !cancelled()
working-directory: util/ci/
env:
DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
run: |
python3 -m pip install -r requirements.txt
- python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+ 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 }}
diff --git a/util/ci/discord-results.py b/util/ci/discord-results.py
index 0c09a4213a..70f6af4b17 100755
--- a/util/ci/discord-results.py
+++ b/util/ci/discord-results.py
@@ -11,6 +11,7 @@ parser = argparse.ArgumentParser(prog='discord-results.py', description='Sends a
parser.add_argument('-b', '--branch')
parser.add_argument('-k', '--keymap')
parser.add_argument('-u', '--url')
+parser.add_argument('-s', '--sha')
args = parser.parse_args()
qmk_dir = Path(__file__).resolve().parents[2].resolve()
@@ -43,6 +44,7 @@ else:
embed.add_embed_field(name='Build Target', value=f'[**{args.branch}**](https://github.com/qmk/qmk_firmware/tree/{args.branch}) / **{args.keymap}** keymap')
embed.add_embed_field(name='Workflow Run', value=f'[**Link**]({args.url})')
+embed.add_embed_field(name='Firmware Binaries', value=f'[**ci.qmk.fm**](https://ci.qmk.fm/{args.branch}/{args.sha}/index.html)')
embed.set_timestamp()
webhook.add_embed(embed)