Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (1825 commits)
  A comma was missing (qmk#19507)
  Bump anothrNick/github-tag-action from 1.56.0 to 1.57.0 (qmk#19502)
  Add SapuSeven MacroPad12 (qmk#19466)
  feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (qmk#19426)
  [Keyboard] Stop LED1 from flashing on layer change (qmk#19427)
  Allow for specifying the number of symbols to output. (qmk#19497)
  Add `qmk mass-compile`, which intends to supercede `qmk multibuild` whilst providing support for filtering as per data-driven definitions. (qmk#18971)
  Bump anothrNick/github-tag-action from 1.55.0 to 1.56.0 (qmk#19494)
  Fix github URL for the atreyu maintainer. (qmk#19476)
  adpenrose/akemipad fixes (qmk#19477)
  [Keymap] Add Neo2-based keymap for Planck keyboard (qmk#19173)
  [Keyboard] Add community layout support to Piantor (qmk#19455)
  Keyboard/fix work louder micro (qmk#18968)
  Add docs to cover recent LAYOUT_all lint checks (qmk#19393)
  WSL `qmk flash firmware.bin` workaround (qmk#19434)
  CLI flashers should allow files outside qmk_firmware folder (qmk#19454)
  [Keyboard] Add Quarkeys Z60, reorganized keyboard file directory (qmk#19404)
  Add KB30 keyboard (qmk#19395)
  Atreyu rev2 (qmk#19443)
  Fixes unicode_map declaration example (qmk#19450)
  ...
  • Loading branch information
barrettclark committed Jan 5, 2023
2 parents dda733f + 84a6422 commit 8b1cd98
Show file tree
Hide file tree
Showing 20,327 changed files with 481,824 additions and 182,967 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
36 changes: 0 additions & 36 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Bug report
description: Create a report to help us improve QMK Firmware.
title: "[Bug] "
labels: ["bug", "help wanted"]
body:
- type: markdown
attributes:
value: |
Provide a general summary of the bug in the title above.
- type: textarea
attributes:
label: Describe the Bug
description: A clear and concise description of what the bug is.
- type: input
attributes:
label: Keyboard Used
description: The name of the keyboard from the `make` or `qmk compile`/`qmk flash` commands, eg. `planck/rev6`.
- type: input
attributes:
label: Link to product page (if applicable)
- type: input
attributes:
label: Operating System
- type: textarea
attributes:
label: qmk doctor Output
description: Output from running the `qmk doctor` command.
render: text
- type: checkboxes
attributes:
label: Is AutoHotKey / Karabiner installed
options:
- label: AutoHotKey (Windows)
- label: Karabiner (macOS)
- type: input
attributes:
label: Other keyboard-related software installed
- type: textarea
attributes:
label: Additional Context
description: Add any other relevant information about the problem here.
24 changes: 0 additions & 24 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Feature request
description: Suggest a new feature or changes to existing features.
title: "[Feature Request] "
labels: ["enhancement", "help wanted"]
body:
- type: markdown
attributes:
value: |
Provide a general summary of the changes you want in the title above.
- type: checkboxes
attributes:
label: Feature Request Type
options:
- label: Core functionality
- label: Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
- label: Alteration (enhancement/optimization) of existing feature(s)
- label: New behavior
- 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.
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/other_issues.md

This file was deleted.

16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/other_issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Other issues
description: Anything else that doesn't fall into the above categories.
labels: ["help wanted", "question"]
body:
- type: markdown
attributes:
value: |
Provide a general summary of the changes you want in the title above.
- type: markdown
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.
- type: textarea
attributes:
label: Issue Description
description: Describe your issue in as much detail as possible.
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
labels: CI
reviewers:
- "qmk/collaborators"
schedule:
interval: "daily"
58 changes: 0 additions & 58 deletions .github/stale.yml

This file was deleted.

22 changes: 17 additions & 5 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,50 @@
name: Update API Data

permissions:
contents: read

on:
push:
branches:
- master
- develop
paths:
- 'keyboards/**'
- 'layouts/community/**'
- 'lib/python/**'
- 'data/**'
- '.github/workflows/api.yml'
workflow_dispatch:

jobs:
api_data:
runs-on: ubuntu-latest
container: qmkfm/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@v2
- uses: actions/checkout@v3
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
SOURCE_DIR: 'api_data'
SOURCE_DIR: '.build/api_data'
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
14 changes: 9 additions & 5 deletions .github/workflows/auto_tag.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
name: Essential files modified

permissions:
contents: write

on:
push:
branches:
- master
paths:
- quantum/**/*
- tmk_core/**/*
- builddefs/**/*
- drivers/**/*
- platforms/**/*
- quantum/**/*
- tests/**/*
- tmk_core/**/*
- util/**/*
- platforms/**/*
- Makefile
- '*.mk'

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

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

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.26.0
uses: anothrNick/github-tag-action@1.57.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
5 changes: 4 additions & 1 deletion .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 @@ -18,7 +21,7 @@ jobs:
container: qmkfm/qmk_cli

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Install dependencies
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/develop_api.yml

This file was deleted.

Loading

0 comments on commit 8b1cd98

Please sign in to comment.