Merge remote-tracking branch 'upstream/master'

* upstream/master: (1294 commits) Smith & Rune Iron160 Hotswap Touch-Up (qmk#21376) Add riot auto-merge to `master` to trigger GH workflows. (qmk#21390) Mechlovin Zed65 rev1 Touch-Up (qmk#21373) Kibou Winter: rename LAYOUT to LAYOUT_tkl_ansi_wkl (qmk#21372) Update config.h (qmk#21361) Kibou Harbour Layout Addition and Touch-Up (qmk#21358) Verify max one keyboard addition during CI. (qmk#21246) Bump tj-actions/changed-files from 36 to 37 (qmk#21356) Jaykeeb Skyline: correct layout data (qmk#21350) Jaykeeb Orba Layout Addition and Touch-Up (qmk#21349) Akko Top40: correct layout data (qmk#21348) Y&R Transition80 Layout Additions and Touch-Up (qmk#21347) Wuque Creek70 Layout Additions and Touch-Up (qmk#21346) Teahouse Ayleen Community Layout Support and Touch-Up (qmk#21341) Viktus OSAv2 Numpad Community Layout Support and Configurator Touch-Up (qmk#21342) Soda Pocket: correct layout data (qmk#21333) Spleeb: correct layout data (qmk#21334) Igloo Configurator Touch-Up (qmk#21303) Quarkeys Z40 Community Layout Support and Touch-Up (qmk#21329) Pteropus: correct layout data (qmk#21326) ...
mdomke · Jun 27, 2023 · c977b8f · c977b8f
2 parents d7bab44 + faf560f
commit c977b8f
Show file tree

Hide file tree

Showing 20,688 changed files with 704,938 additions and 569,891 deletions.
diff --git a/.clangd b/.clangd
@@ -0,0 +1,4 @@
+CompileFlags:
+  Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
+  Remove: [-W*, -mcall-prologues]
+  Compiler: clang
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,6 +7,9 @@ body:
     attributes:
       value: |
         Provide a general summary of the changes you want in the title above.
+
+        Please refrain from asking maintainers to add support for specific keyboards -- it is unlikely they will have hardware available, and will not be able to help.
+        Your best bet is to take the initiative, add support, then submit a PR yourself.
   - type: checkboxes
     attributes:
       label: Feature Request Type
@@ -18,4 +21,4 @@ body:
   - type: textarea
     attributes:
       label: Description
-      description: A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful.
+      description: A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful.
diff --git a/.github/ISSUE_TEMPLATE/other_issues.yml b/.github/ISSUE_TEMPLATE/other_issues.yml
@@ -10,7 +10,10 @@ body:
     attributes:
       value: |
         Please check [https://docs.qmk.fm/#/support](https://docs.qmk.fm/#/support) for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate.
+
+        Please refrain from asking maintainers to add support for specific keyboards -- it is unlikely they will have hardware available, and will not be able to help.
+        Your best bet is to take the initiative, add support, then submit a PR yourself.
   - type: textarea
     attributes:
       label: Issue Description
-      description: Describe your issue in as much detail as possible.
+      description: Describe your issue in as much detail as possible.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -5,6 +5,7 @@ core:
   - tests/**/*
   - util/**/*
   - platforms/**/*
+  - builddefs/**/*
   - Makefile
   - '*.mk'
 dependencies:

diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
@@ -1,5 +1,8 @@
 name: Update API Data
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -16,7 +19,7 @@ on:
 jobs:
   api_data:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     # protect against those who work in their fork on 'important' branches
     if: github.repository == 'qmk/qmk_firmware'

diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
@@ -1,5 +1,7 @@
 name: Automatic Approve
 
+permissions: {}
+
 on:
   schedule:
     - cron: "*/5 * * * *"

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
@@ -1,16 +1,21 @@
 name: Essential files modified
 
+permissions:
+  contents: write
+
 on:
+  workflow_dispatch:
   push:
     branches:
     - master
     paths:
-    - quantum/**/*
-    - tmk_core/**/*
+    - builddefs/**/*
     - drivers/**/*
+    - platforms/**/*
+    - quantum/**/*
     - tests/**/*
+    - tmk_core/**/*
     - util/**/*
-    - platforms/**/*
     - Makefile
     - '*.mk'
 
@@ -27,7 +32,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.54.0
+      uses: anothrNick/github-tag-action@1.66.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
@@ -0,0 +1,74 @@
+name: CI Builds
+
+permissions:
+  contents: read
+
+on:
+  push:
+    branches: [master, develop]
+  workflow_dispatch:
+    inputs:
+      branch:
+        type: choice
+        description: 'Branch to build'
+        options: [master, develop]
+
+concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
+
+jobs:
+  ci_builds:
+    if: github.repository == 'qmk/qmk_firmware'
+    name: "CI Build"
+    runs-on: self-hosted
+    timeout-minutes: 1380
+
+    strategy:
+      fail-fast: false
+      matrix:
+        keymap: [default, via]
+
+    container: ghcr.io/qmk/qmk_cli
+
+    steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        ref: ${{ github.event.inputs.branch || github.ref }}
+
+    - name: Install dependencies
+      run: pip3 install -r requirements.txt
+
+    - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
+      run: |
+        export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
+        # Generate the step summary markdown
+        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
+        # Truncate to a maximum of 1MB to deal with GitHub workflow limit
+        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
+        # Exit with failure if the compilation stage failed
+        [ ! -f .failed ] || exit 1
+
+    - name: 'Upload artifacts'
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
+        if-no-files-found: ignore
+        path: |
+          *.bin
+          *.hex
+          *.uf2
+          .build/failed.*
+
+    - name: 'CI Discord Notification'
+      if: always()
+      working-directory: util/ci/
+      env:
+        DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
+      run: |
+        python3 -m pip install -r requirements.txt
+        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 }}
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -1,5 +1,8 @@
 name: CLI CI
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -15,12 +18,16 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
     - name: Run tests

diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
@@ -1,5 +1,8 @@
 name: Update develop after master merge
 
+permissions:
+  contents: write
+
 on:
   push:
     branches:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,5 +1,8 @@
 name: Generate Docs
 
+permissions:
+  contents: write
+
 on:
   push:
     branches:
@@ -14,7 +17,7 @@ on:
 jobs:
   generate:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     # protect against those who develop with their fork on master
     if: github.repository == 'qmk/qmk_firmware'
@@ -34,7 +37,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.4.1
+      uses: JamesIves/github-pages-deploy-action@v4.4.2
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master

diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
@@ -1,5 +1,8 @@
 name: Update feature branches after develop merge
 
+permissions:
+  contents: write
+
 on:
   push:
     branches:
@@ -15,6 +18,7 @@ jobs:
       matrix:
         branch:
         - xap
+        - riot
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -1,5 +1,8 @@
 name: PR Lint Format
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     paths:
@@ -16,9 +19,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -27,16 +33,14 @@ jobs:
       run: |
         pip3 install -r requirements-dev.txt
 
-    - uses: trilom/file-changes-action@v1.2.4
+    - name: Get changed files
       id: file_changes
-      with:
-        output: ' '
-        fileOutput: ' '
+      uses: tj-actions/changed-files@v37
 
     - name: Run qmk formatters
       shell: 'bash {0}'
       run: |
-        cat ~/files_added.txt ~/files_modified.txt > ~/files_changed.txt
+        echo '${{ steps.file_changes.outputs.added_files}}' '${{ steps.file_changes.outputs.modified_files}}' > ~/files_changed.txt
         qmk format-c --core-only $(< ~/files_changed.txt) || true
         qmk format-python $(< ~/files_changed.txt) || true
         qmk format-text $(< ~/files_changed.txt) || true

diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
@@ -1,5 +1,8 @@
 name: Lint Format
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -10,9 +13,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -41,7 +47,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v5
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -1,5 +1,9 @@
 name: "Pull Request Labeler"
 
+permissions:
+  contents: read
+  pull-requests: write
+
 on:
   pull_request_target:
     types: [opened, synchronize, reopened, ready_for_review, locked]