Merge remote-tracking branch 'upstream/master'

.clangd

@@ -1,4 +1,4 @@
 CompileFlags:
  Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
- Remove: [-W*, -mcall-prologues]
+ Remove: [-W*, -mmcu=*, -mcpu=*, -mfpu=*, -mfloat-abi=*, -mno-unaligned-access, -mno-thumb-interwork, -mcall-prologues]
  Compiler: clang

.editorconfig

@@ -4,39 +4,39 @@
 root = true
 
 [*]
+end_of_line = lf
 indent_style = space
 indent_size = 4
-
-# We recommend you to keep these unchanged
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[{*.yaml,*.yml}] # To match GitHub Actions formatting
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
-indent_size = 4
-
-[{qmk,*.py}]
-charset = utf-8
-max_line_length = 200
-
-# Make these match what we have in .gitattributes
-[*.mk]
-end_of_line = lf
-indent_style = tab
 
-[Makefile]
-end_of_line = lf
+[{Makefile,*.mk}]
 indent_style = tab
 
-[*.sh]
-end_of_line = lf
-
-# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
-
-
-# We don't have gitattributes properly for these
-# So if the user have for example core.autocrlf set to true
-# the line endings would be wrong.
+# Don't override anything in `lib/`...
 [lib/**]
+indent_style = unset
+indent_size = unset
+tab_width = unset
 end_of_line = unset
+charset = unset
+spelling_language = unset
+trim_trailing_whitespace = unset
+insert_final_newline = unset
+
+# ...except QMK's `lib/python`.
+[{*.py,lib/python/**.py}]
+end_of_line = lf
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 200

.github/workflows/docs.yml

@@ -37,7 +37,7 @@ jobs:
  qmk --verbose generate-docs
 
  - name: Deploy
- uses: JamesIves/github-pages-deploy-action@v4.5.0
+ uses: JamesIves/github-pages-deploy-action@v4.6.0
  with:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  BASE_BRANCH: master

.github/workflows/format.yml

@@ -35,7 +35,9 @@ jobs:
 
  - name: Get changed files
  id: file_changes
- uses: tj-actions/changed-files@v41
+ uses: tj-actions/changed-files@v44
+ with:
+ use_rest_api: true
 
  - name: Run qmk formatters
  shell: 'bash {0}'

.github/workflows/format_push.yml

@@ -47,7 +47,7 @@ jobs:
  git config user.email '[email protected]'
 
  - name: Create Pull Request
- uses: peter-evans/create-pull-request@v5
+ uses: peter-evans/create-pull-request@v6
  if: ${{ github.repository == 'qmk/qmk_firmware'}}
  with:
  token: ${{ secrets.QMK_BOT_TOKEN }}

.github/workflows/lint.yml

@@ -27,7 +27,9 @@ jobs:
 
  - name: Get changed files
  id: file_changes
- uses: tj-actions/changed-files@v41
+ uses: tj-actions/changed-files@v44
+ with:
+ use_rest_api: true
 
  - name: Print info
  run: |
@@ -62,10 +64,12 @@ jobs:
 
  qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
  for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
- if ! git diff --quiet $file; then
- echo "File '${file}' Requires Formatting"
- echo "::error file=${file}::Requires Formatting"
- exit_code=$(($exit_code + 1))
+ if [[ -f $file ]]; then
+ if ! git diff --quiet $file; then
+ echo "File '${file}' Requires Formatting"
+ echo "::error file=${file}::Requires Formatting"
+ exit_code=$(($exit_code + 1))
+ fi
  fi
  done
 

.github/workflows/regen_push.yml

@@ -34,7 +34,7 @@ jobs:
  git config user.email '[email protected]'
 
  - name: Create Pull Request
- uses: peter-evans/create-pull-request@v5
+ uses: peter-evans/create-pull-request@v6
  if: ${{ github.repository == 'qmk/qmk_firmware'}}
  with:
  token: ${{ secrets.QMK_BOT_TOKEN }}

.gitignore

@@ -18,6 +18,11 @@
 *.lst
 *.map
 *.o
+*.a
+*.so
+*.dylib
+*.dll
+*.la
 *.stackdump
 *.sym
 

Makefile

@@ -337,24 +337,23 @@ define BUILD_TEST
  endif
 endef
 
+define LIST_TEST
+ include $(BUILDDEFS_PATH)/testlist.mk
+ FOUND_TESTS := $$(patsubst ./tests/%,%,$$(TEST_LIST))
+ $$(info $$(FOUND_TESTS))
+endef
+
 define PARSE_TEST
  TESTS :=
- # list of possible targets, colon-delimited, to reassign to MAKE_TARGET and remove
- TARGETS := :clean:
- ifneq (,$$(findstring :$$(lastword $$(subst :, ,$$(RULE))):, $$(TARGETS)))
- MAKE_TARGET := $$(lastword $$(subst :, ,$$(RULE)))
- TEST_SUBPATH := $$(subst $$(eval) ,/,$$(wordlist 2, $$(words $$(subst :, ,$$(RULE))), _ $$(subst :, ,$$(RULE))))
- else
- MAKE_TARGET :=
- TEST_SUBPATH := $$(subst :,/,$$(RULE))
- endif
+ TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
+ TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
  include $(BUILDDEFS_PATH)/testlist.mk
- ifeq ($$(RULE),all)
+ ifeq ($$(TEST_NAME),all)
  MATCHED_TESTS := $$(TEST_LIST)
  else
- MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring /$$(TEST_SUBPATH)/, $$(patsubst %,%/,$$(TEST))), $$(TEST),))
+ MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(patsubst ./tests/%,%,$$(TEST)x)), $$(TEST),))
  endif
- $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(MAKE_TARGET))))
+ $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
 endef
 
 
@@ -437,6 +436,10 @@ git-submodules: git-submodule
 list-keyboards:
  $(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
 
+.PHONY: list-tests
+list-tests:
+ $(eval $(call LIST_TEST))
+
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
  $(QMK_BIN) list-keyboards --no-resolve-defaults