Skip to content

Commit

Permalink
Merge branch 'master' into c42x_handheld
Browse files Browse the repository at this point in the history
* master: (2548 commits)
  add keyboard bestway (qmk#22498)
  revoke community_layouts from keebio/wtf60 (qmk#22502)
  nullbitsco/snap: reduce size of bongo_reactive (qmk#22571)
  Fixup `--no-temp` for `qmk mass-compile`. (qmk#22582)
  Add Smith and Rune Magnus (qmk#22153)
  Add Magnum Ergo 1 by dark (qmk#22139)
  Add ScottoWing handwired keyboard (qmk#22506)
  add tokki (qmk#22463)
  cablecardesigns/phoenix: correct layout data (qmk#22517)
  [Doc]: Correct Markdown syntax errors. (qmk#22511)
  Fixup compilation with `qmk compile -kb zzz -km all`. (qmk#22568)
  Small QP surface docs update (qmk#22567)
  Bump JamesIves/github-pages-deploy-action from 4.4.3 to 4.5.0 (qmk#22559)
  Attempt to fix configurator. (qmk#22555)
  Remove notice about `develop`.
  `develop` 2023q4 changelog (qmk#22552)
  QMK Userspace (qmk#22222)
  Fix missed shutdown callbacks (qmk#22549)
  Remove symbolic linked userspace folder (qmk#22548)
  Remove userspace keymaps (qmk#22544)
  ...
  • Loading branch information
riichard committed Dec 1, 2023
2 parents 42d69f7 + 5368ddb commit 1b240df
Show file tree
Hide file tree
Showing 30,594 changed files with 954,428 additions and 877,258 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .clangd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CompileFlags:
Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
Remove: [-W*, -mcall-prologues]
Compiler: clang
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/other_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ core:
- tests/**/*
- util/**/*
- platforms/**/*
- builddefs/**/*
- Makefile
- '*.mk'
dependencies:
Expand Down Expand Up @@ -39,3 +40,7 @@ translation:
- docs/ru-ru/**/*
CI:
- .github/**/*
dd:
- data/constants/**/*
- data/mappings/**/*
- data/schemas/**/*
19 changes: 14 additions & 5 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Update API Data

permissions:
contents: read

on:
push:
branches:
- master
- develop
paths:
- 'keyboards/**'
- 'layouts/community/**'
Expand All @@ -15,26 +19,31 @@ on:
jobs:
api_data:
runs-on: ubuntu-latest
container: qmkfm/qmk_cli
container: ghcr.io/qmk/qmk_cli

# protect against those who develop with their fork on master
# protect against those who work in their fork on 'important' branches
if: github.repository == 'qmk/qmk_firmware'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
persist-credentials: false

- name: Install dependencies
run: |
pip3 install -r requirements-dev.txt
- name: Generate API Data
run: qmk generate-api
run: |
qmk generate-api
- name: Upload API Data
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: ${{ secrets.API_SPACE_MASTER }}
AWS_S3_BUCKET: ${{ github.ref == 'refs/heads/develop' && secrets['API_SPACE_DEVELOP'] || secrets['API_SPACE_MASTER'] }}
AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/auto_approve.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: Automatic Approve

permissions: {}

on:
schedule:
- cron: "*/5 * * * *"
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/auto_tag.yml
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -22,12 +27,12 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.52.0
uses: anothrNick/github-tag-action@1.66.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
74 changes: 74 additions & 0 deletions .github/workflows/ci_builds.yml
Original file line number Diff line number Diff line change
@@ -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@v4
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 }}
11 changes: 9 additions & 2 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: CLI CI

permissions:
contents: read

on:
push:
branches:
Expand All @@ -15,12 +18,16 @@ jobs:
test:
runs-on: ubuntu-latest

container: qmkfm/qmk_cli
container: ghcr.io/qmk/qmk_cli

steps:
- uses: actions/checkout@v3
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'

- uses: actions/checkout@v4
with:
submodules: recursive

- name: Install dependencies
run: pip3 install -r requirements-dev.txt
- name: Run tests
Expand Down
43 changes: 0 additions & 43 deletions .github/workflows/develop_api.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/develop_update.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Update develop after master merge

permissions:
contents: write

on:
push:
branches:
Expand All @@ -12,7 +15,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Generate Docs

permissions:
contents: write

on:
push:
branches:
Expand All @@ -14,13 +17,13 @@ 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'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -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.5.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE_BRANCH: master
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/feature_branch_update.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Update feature branches after develop merge

permissions:
contents: write

on:
push:
branches:
Expand All @@ -15,9 +18,10 @@ jobs:
matrix:
branch:
- xap
- riot

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0
Expand Down
Loading

0 comments on commit 1b240df

Please sign in to comment.