Skip to content

Commit 6460485

Browse files
authored
Merge branch 'qmk:master' into goon_dev
2 parents 27cccf7 + f6c70c4 commit 6460485

File tree

22,419 files changed

+794356
-627352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

22,419 files changed

+794356
-627352
lines changed

.clangd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CompileFlags:
2+
Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
3+
Remove: [-W*, -mcall-prologues]
4+
Compiler: clang

.github/labeler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ core:
55
- tests/**/*
66
- util/**/*
77
- platforms/**/*
8+
- builddefs/**/*
89
- Makefile
910
- '*.mk'
1011
dependencies:
@@ -39,3 +40,7 @@ translation:
3940
- docs/ru-ru/**/*
4041
CI:
4142
- .github/**/*
43+
dd:
44+
- data/constants/**/*
45+
- data/mappings/**/*
46+
- data/schemas/**/*

.github/workflows/api.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ on:
1919
jobs:
2020
api_data:
2121
runs-on: ubuntu-latest
22-
container: qmkfm/qmk_cli
22+
container: ghcr.io/qmk/qmk_cli
2323

2424
# protect against those who work in their fork on 'important' branches
2525
if: github.repository == 'qmk/qmk_firmware'
2626

2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
with:
3030
fetch-depth: 1
3131
persist-credentials: false

.github/workflows/auto_tag.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ permissions:
44
contents: write
55

66
on:
7+
workflow_dispatch:
78
push:
89
branches:
910
- master
@@ -26,12 +27,12 @@ jobs:
2627
if: github.repository == 'qmk/qmk_firmware'
2728

2829
steps:
29-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3031
with:
3132
fetch-depth: 0
3233

3334
- name: Bump version and push tag
34-
uses: anothrNick/github-tag-action@1.61.0
35+
uses: anothrNick/github-tag-action@1.66.0
3536
env:
3637
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3738
DEFAULT_BUMP: 'patch'

.github/workflows/ci_builds.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: CI Builds
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
branches: [master, develop]
9+
workflow_dispatch:
10+
inputs:
11+
branch:
12+
type: choice
13+
description: 'Branch to build'
14+
options: [master, develop]
15+
16+
concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
17+
18+
jobs:
19+
ci_builds:
20+
if: github.repository == 'qmk/qmk_firmware'
21+
name: "CI Build"
22+
runs-on: self-hosted
23+
timeout-minutes: 1380
24+
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
keymap: [default, via]
29+
30+
container: ghcr.io/qmk/qmk_cli
31+
32+
steps:
33+
- name: Disable safe.directory check
34+
run : git config --global --add safe.directory '*'
35+
36+
- uses: actions/checkout@v4
37+
with:
38+
submodules: recursive
39+
ref: ${{ github.event.inputs.branch || github.ref }}
40+
41+
- name: Install dependencies
42+
run: pip3 install -r requirements.txt
43+
44+
- name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
45+
run: |
46+
export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
47+
qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
48+
# Generate the step summary markdown
49+
./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
50+
# Truncate to a maximum of 1MB to deal with GitHub workflow limit
51+
truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
52+
# Exit with failure if the compilation stage failed
53+
[ ! -f .failed ] || exit 1
54+
55+
- name: 'Upload artifacts'
56+
uses: actions/upload-artifact@v3
57+
if: always()
58+
with:
59+
name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
60+
if-no-files-found: ignore
61+
path: |
62+
*.bin
63+
*.hex
64+
*.uf2
65+
.build/failed.*
66+
67+
- name: 'CI Discord Notification'
68+
if: always()
69+
working-directory: util/ci/
70+
env:
71+
DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
72+
run: |
73+
python3 -m pip install -r requirements.txt
74+
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 }}

.github/workflows/cli.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ jobs:
1818
test:
1919
runs-on: ubuntu-latest
2020

21-
container: qmkfm/qmk_cli
21+
container: ghcr.io/qmk/qmk_cli
2222

2323
steps:
24-
- uses: actions/checkout@v3
24+
- name: Disable safe.directory check
25+
run : git config --global --add safe.directory '*'
26+
27+
- uses: actions/checkout@v4
2528
with:
2629
submodules: recursive
30+
2731
- name: Install dependencies
2832
run: pip3 install -r requirements-dev.txt
2933
- name: Run tests

.github/workflows/develop_update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'qmk/qmk_firmware'
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
token: ${{ secrets.QMK_BOT_TOKEN }}
2121
fetch-depth: 0

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ on:
1717
jobs:
1818
generate:
1919
runs-on: ubuntu-latest
20-
container: qmkfm/qmk_cli
20+
container: ghcr.io/qmk/qmk_cli
2121

2222
# protect against those who develop with their fork on master
2323
if: github.repository == 'qmk/qmk_firmware'
2424

2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 1
2929

@@ -37,7 +37,7 @@ jobs:
3737
qmk --verbose generate-docs
3838
3939
- name: Deploy
40-
uses: JamesIves/[email protected].1
40+
uses: JamesIves/[email protected].3
4141
with:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343
BASE_BRANCH: master

.github/workflows/feature_branch_update.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
matrix:
1919
branch:
2020
- xap
21+
- riot
2122

2223
steps:
23-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2425
with:
2526
token: ${{ secrets.QMK_BOT_TOKEN }}
2627
fetch-depth: 0

.github/workflows/format.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,28 @@ jobs:
1919
lint:
2020
runs-on: ubuntu-latest
2121

22-
container: qmkfm/qmk_cli
22+
container: ghcr.io/qmk/qmk_cli
2323

2424
steps:
25-
- uses: actions/checkout@v3
25+
- name: Disable safe.directory check
26+
run : git config --global --add safe.directory '*'
27+
28+
- uses: actions/checkout@v4
2629
with:
2730
fetch-depth: 0
2831

2932
- name: Install dependencies
3033
run: |
3134
pip3 install -r requirements-dev.txt
3235
33-
- uses: trilom/[email protected]
36+
- name: Get changed files
3437
id: file_changes
35-
with:
36-
output: ' '
37-
fileOutput: ' '
38+
uses: tj-actions/changed-files@v39
3839

3940
- name: Run qmk formatters
4041
shell: 'bash {0}'
4142
run: |
42-
cat ~/files_added.txt ~/files_modified.txt > ~/files_changed.txt
43+
echo '${{ steps.file_changes.outputs.added_files}}' '${{ steps.file_changes.outputs.modified_files}}' > ~/files_changed.txt
4344
qmk format-c --core-only $(< ~/files_changed.txt) || true
4445
qmk format-python $(< ~/files_changed.txt) || true
4546
qmk format-text $(< ~/files_changed.txt) || true

0 commit comments

Comments
 (0)