poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2024-07-12 00:20:05 +00:00
commit 57b7f8534b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci_build_major_branch_keymap.yml vendored
View file

@ -172,10 +172,10 @@ jobs:
targets-${{ inputs.keymap }} targets-${{ inputs.keymap }}
- name: 'CI Discord Notification' - name: 'CI Discord Notification'
if: always() if: always() && !cancelled()
working-directory: util/ci/ working-directory: util/ci/
env: env:
DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }} DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
run: | run: |
python3 -m pip install -r requirements.txt 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 }}

2
util/ci/discord-results.py
View file

@ -11,6 +11,7 @@ parser = argparse.ArgumentParser(prog='discord-results.py', description='Sends a
parser.add_argument('-b', '--branch') parser.add_argument('-b', '--branch')
parser.add_argument('-k', '--keymap') parser.add_argument('-k', '--keymap')
parser.add_argument('-u', '--url') parser.add_argument('-u', '--url')
parser.add_argument('-s', '--sha')
args = parser.parse_args() args = parser.parse_args()
qmk_dir = Path(__file__).resolve().parents[2].resolve() 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='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='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() embed.set_timestamp()
webhook.add_embed(embed) webhook.add_embed(embed)