Merge branch 'master' of https://github.com/qmk/qmk_firmware

.clang-format

@@ -5,6 +5,9 @@ AlignConsecutiveAssignments: 'true'
 AlignConsecutiveDeclarations: 'true'
 AlignOperands: 'true'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: 'false'
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: 'false'
@@ -20,6 +23,7 @@ SortIncludes: 'false'
 SpaceBeforeAssignmentOperators: 'true'
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: 'false'
+SpacesBeforeTrailingComments: 1
 TabWidth: '4'
 UseTab: Never
 

.gitattributes

@@ -2,69 +2,70 @@
 * text=auto
 
 # sources
-*.c text
-*.cc text
-*.cxx text
-*.cpp text
-*.c++ text
-*.hpp text
-*.h text
-*.h++ text
-*.hh text
-*.bat text
-*.coffee text
-*.css text
-*.htm text
-*.html text
-*.inc text
-*.ini text
-*.js text
-*.jsx text
-*.json text
-*.less text
-*.php text
-*.pl text
-*.py text
-*.rb text
-*.sass text
-*.scm text
-*.scss text
-*.sh text
-*.sql text
-*.styl text
-*.ts text
-*.xml text
-*.xhtml text
+*.c text eol=lf
+*.cc text eol=lf
+*.cxx text eol=lf
+*.cpp text eol=lf
+*.c++ text eol=lf
+*.hpp text eol=lf
+*.h text eol=lf
+*.h++ text eol=lf
+*.hh text eol=lf
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.coffee text eol=lf
+*.css text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.inc text eol=lf
+*.ini text eol=crlf
+*.js text eol=lf
+*.jsx text eol=lf
+*.json text eol=lf
+*.less text eol=lf
+*.php text eol=lf
+*.pl text eol=lf
+*.py text eol=lf
+*.rb text eol=lf
+*.sass text eol=lf
+*.scm text eol=lf
+*.scss text eol=lf
+*.sh text eol=lf
+*.sql text eol=lf
+*.styl text eol=lf
+*.ts text eol=lf
+*.xml text eol=lf
+*.xhtml text eol=lf
 
 # make files (need to always use lf for compatibility with Windows 10 bash)
 Makefile eol=lf
-*.mk eol=lf
+*.mk  eol=lf
 
 # make files (need to always use lf for compatibility with Windows 10 bash)
 *.sh eol=lf
 
 # documentation
-*.markdown text
-*.md text
-*.mdwn text
-*.mdown text
-*.mkd text
-*.mkdn text
-*.mdtxt text
-*.mdtext text
-*.txt text
-AUTHORS text
-CHANGELOG text
-CHANGES text
-CONTRIBUTING text
-COPYING text
-INSTALL text
-license text
-LICENSE text
-NEWS text
-readme text
-*README* text
-TODO text
+*.markdown text eol=lf
+*.md text eol=lf
+*.mdwn text eol=lf
+*.mdown text eol=lf
+*.mkd text eol=lf
+*.mkdn text eol=lf
+*.mdtxt text eol=lf
+*.mdtext text eol=lf
+*.txt text eol=lf
+AUTHORS text eol=lf
+CHANGELOG text eol=lf
+CHANGES text eol=lf
+CONTRIBUTING text eol=lf
+COPYING text eol=lf
+INSTALL text eol=lf
+license text eol=lf
+LICENSE text eol=lf
+NEWS text eol=lf
+readme text eol=lf
+*README* text eol=lf
+TODO text eol=lf
 
 GRAPHICS
 *.ai binary
@@ -82,7 +83,7 @@ GRAPHICS
 *.png binary
 *.psb binary
 *.psd binary
-*.svg text
+*.svg text eol=lf
 *.svgz binary
 *.tif binary
 *.tiff binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,19 +18,18 @@ assignees: ''
 
 ## System Information
 
- - Keyboard: 
- - Revision (if applicable): 
- - Operating system:
- - AVR GCC version: 
-<!-- Run `avr-gcc --version` to find this out. -->
- - ARM GCC version: 
-<!-- Run `arm-none-eabi-gcc --version` to find this out. -->
- - QMK Firmware version:
-<!-- Run `git describe --abbrev=0 --tags` to find this out. -->
- - Any keyboard related software installed? 
- - [ ] AutoHotKey
- - [ ] Karabiner
- - [ ] Other:
+**Keyboard:** 
+**Revision (if applicable):** 
+**Operating system:** 
+**`qmk doctor` output:** 
+```
+(Paste output here)
+```
+
+**Any keyboard related software installed?** 
+ - [ ] AutoHotKey (Windows)
+ - [ ] Karabiner (macOS)
+ - [ ] Other:
 
 ## Additional Context
 

.github/labeler.yml

@@ -22,7 +22,6 @@ keymap:
 via:
  - keyboards/**/keymaps/via/*
 cli:
- - bin/qmk
  - requirements.txt
  - lib/python/**/*
 python:

.github/workflows/api.yml

@@ -12,7 +12,7 @@ on:
 jobs:
  api_data:
  runs-on: ubuntu-latest
- container: qmkfm/base_container
+ container: qmkfm/qmk_cli
 
  # protect against those who develop with their fork on master
  if: github.repository == 'qmk/qmk_firmware'

.github/workflows/auto_approve.yml

@@ -0,0 +1,18 @@
+name: Automatic Approve
+
+on:
+ schedule:
+ - cron: "*/5 * * * *"
+
+jobs:
+ automatic_approve:
+ runs-on: ubuntu-latest
+
+ if: github.repository == 'qmk/qmk_firmware'
+
+ steps:
+ - uses: mheap/automatic-approve-action@v1
+ with:
+ token: ${{ secrets.QMK_BOT_TOKEN }}
+ workflows: "format.yml,lint.yml,unit_test.yml"
+ dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"

.github/workflows/cli.yml

@@ -4,19 +4,18 @@ on:
  push:
  branches:
  - master
- - future
+ - develop
  pull_request:
  paths:
  - 'lib/python/**'
- - 'bin/qmk'
  - 'requirements.txt'
  - '.github/workflows/cli.yml'
 
 jobs:
  test:
  runs-on: ubuntu-latest
 
- container: qmkfm/base_container
+ container: qmkfm/qmk_cli
 
  steps:
  - uses: actions/checkout@v2
@@ -25,4 +24,4 @@ jobs:
  - name: Install dependencies
  run: pip3 install -r requirements-dev.txt
  - name: Run tests
- run: bin/qmk pytest
+ run: qmk pytest

.github/workflows/develop_api.yml

@@ -12,7 +12,7 @@ on:
 jobs:
  api_data:
  runs-on: ubuntu-latest
- container: qmkfm/base_container
+ container: qmkfm/qmk_cli
 
  # protect against those who work in their fork on develop
  if: github.repository == 'qmk/qmk_firmware'

.github/workflows/develop_update.yml

@@ -5,7 +5,6 @@ on:
  branches:
  - master
 
-
 jobs:
  develop_update:
  runs-on: ubuntu-latest
@@ -15,21 +14,15 @@ jobs:
  steps:
  - uses: actions/checkout@v2
  with:
+ token: ${{ secrets.QMK_BOT_TOKEN }}
  fetch-depth: 0
 
  - name: Checkout develop
  run: |
  git fetch origin master develop
  git checkout develop
 
- - name: Check if branch locked
- id: check_locked
- uses: andstor/file-existence-action@v1
- with:
- files: ".locked"
-
  - name: Update develop from master
- if: steps.check_locked.outputs.files_exists == 'false'
  run: |
  git config --global user.name "QMK Bot"
  git config --global user.email "[email protected]"

.github/workflows/docs.yml

@@ -14,7 +14,7 @@ on:
 jobs:
  generate:
  runs-on: ubuntu-latest
- container: qmkfm/base_container
+ container: qmkfm/qmk_cli
 
  # protect against those who develop with their fork on master
  if: github.repository == 'qmk/qmk_firmware'

.github/workflows/feature_branch_update.yml

@@ -0,0 +1,35 @@
+name: Update feature branches after develop merge
+
+on:
+ push:
+ branches:
+ - develop
+
+jobs:
+ feature_branch_update:
+ runs-on: ubuntu-latest
+
+ if: github.repository == 'qmk/qmk_firmware'
+
+ strategy:
+ matrix:
+ branch:
+ - xap
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ token: ${{ secrets.QMK_BOT_TOKEN }}
+ fetch-depth: 0
+
+ - name: Checkout branch
+ run: |
+ git fetch origin develop ${{ matrix.branch }}
+ git checkout ${{ matrix.branch }}
+
+ - name: Update branch from develop
+ run: |
+ git config --global user.name "QMK Bot"
+ git config --global user.email "[email protected]"
+ git merge origin/develop
+ git push origin ${{ matrix.branch }}