gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-22 11:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2023-04-09 21:38:46 +00:00
commit 15e5a586c1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ci_builds.yml vendored
View File

@ -4,9 +4,16 @@ permissions:
contents: read contents: read
on: on:
push:
branches: [master, develop]
workflow_dispatch: workflow_dispatch:
schedule: inputs:
- cron: '0 0,12 * * *' branch:
type: choice
description: 'Branch to build'
options: [master, develop]
concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
jobs: jobs:
ci_builds: ci_builds:
@ -18,7 +25,6 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
branch: [master, develop]
keymap: [default, via] keymap: [default, via]
container: ghcr.io/qmk/qmk_cli container: ghcr.io/qmk/qmk_cli
@ -30,7 +36,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
ref: ${{ matrix.branch }} ref: ${{ github.event.inputs.branch || github.ref }}
- name: Install dependencies - name: Install dependencies
run: pip3 install -r requirements.txt run: pip3 install -r requirements.txt
@ -50,7 +56,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: always() if: always()
with: with:
name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }} name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
if-no-files-found: ignore if-no-files-found: ignore
path: | path: |
*.bin *.bin
@ -65,4 +71,4 @@ jobs:
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 ${{ matrix.branch }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}