summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-11-08 17:14:27 -0800
committerDrashna Jael're <drashna@live.com>2022-11-08 17:14:27 -0800
commit64f04b30c2f48fc0e7c49ca043443f03dc56df94 (patch)
treee0f374d3b92bacefd22c31e7bda8ee1c6fcb37de /.github
parentd9f575fa86ca10b990958d4e677c6a0a387dc7c3 (diff)
parent96c48a5f4aa461ed31fd4ee61151ac206e16fb5f (diff)
Merge tag '0.18.16' into firmware22
Diffstat (limited to '.github')
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md36
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.yml41
-rw-r--r--.github/ISSUE_TEMPLATE/feature_request.md24
-rw-r--r--.github/ISSUE_TEMPLATE/feature_request.yml21
-rw-r--r--.github/ISSUE_TEMPLATE/other_issues.md14
-rw-r--r--.github/ISSUE_TEMPLATE/other_issues.yml16
-rw-r--r--.github/labeler.yml41
-rw-r--r--.github/stale.yml58
-rw-r--r--.github/workflows/auto_approve.yml18
-rw-r--r--.github/workflows/develop_update.yml30
-rw-r--r--.github/workflows/feature_branch_update.yml35
-rw-r--r--.github/workflows/format.yml2
-rw-r--r--.github/workflows/format_push.yml8
-rw-r--r--.github/workflows/labeler.yml14
-rw-r--r--.github/workflows/lint.yml5
-rw-r--r--.github/workflows/unit_test.yml2
16 files changed, 90 insertions, 275 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 81561eaba6..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve QMK Firmware.
-title: "[Bug] "
-labels: bug, help wanted
-assignees: ''
-
----
-
-<!-- Provide a general summary of the bug in the title above. -->
-
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-## Describe the Bug
-
-<!-- A clear and concise description of what the bug is. -->
-
-## System Information
-
-**Keyboard:**
-**Revision (if applicable):**
-**Operating system:**
-**`qmk doctor` output:**
-```
-(Paste output here)
-```
-
-**Any keyboard related software installed?**
- - [ ] AutoHotKey (Windows)
- - [ ] Karabiner (macOS)
- - [ ] Other:
-
-## Additional Context
-
-<!-- Add any other relevant information about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..a5d185e1dd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -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. \ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 1876834247..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature or changes to existing features.
-title: "[Feature Request] "
-labels: enhancement, help wanted
-assignees: ''
-
----
-
-<!--- Provide a general summary of the changes you want in the title above. -->
-
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-## Feature Request Type
-
-- [ ] Core functionality
-- [ ] Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
-- [ ] Alteration (enhancement/optimization) of existing feature(s)
-- [ ] New behavior
-
-## 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/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..585bcf2e6f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -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. \ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/other_issues.md b/.github/ISSUE_TEMPLATE/other_issues.md
deleted file mode 100644
index befeeb165a..0000000000
--- a/.github/ISSUE_TEMPLATE/other_issues.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Other issues
-about: Anything else that doesn't fall into the above categories.
-title: ''
-labels: help wanted, question
-assignees: ''
-
----
-
-<!--- Provide a general summary of the changes you want in the title above. -->
-
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-<!-- Please check 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. -->
diff --git a/.github/ISSUE_TEMPLATE/other_issues.yml b/.github/ISSUE_TEMPLATE/other_issues.yml
new file mode 100644
index 0000000000..7c4fbeb23c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other_issues.yml
@@ -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. \ No newline at end of file
diff --git a/.github/labeler.yml b/.github/labeler.yml
deleted file mode 100644
index 41b2475f67..0000000000
--- a/.github/labeler.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-core:
- - quantum/**/*
- - tmk_core/**/*
- - drivers/**/*
- - tests/**/*
- - util/**/*
- - platforms/**/*
- - Makefile
- - '*.mk'
-dependencies:
- - any:
- - 'lib/**/*'
- - '!lib/python/**/*'
-keyboard:
- - any:
- - 'keyboards/**/*'
- - '!keyboards/**/keymaps/**/*'
-keymap:
- - users/**/*
- - layouts/**/*
- - keyboards/**/keymaps/**/*
-via:
- - keyboards/**/keymaps/via/*
-cli:
- - requirements.txt
- - lib/python/**/*
-python:
- - '**/*.py'
-documentation:
- - docs/**/*
-translation:
- - docs/fr-fr/**/*
- - docs/es/**/*
- - docs/ja/**/*
- - docs/he-il/**/*
- - docs/pt-br/**/*
- - docs/zh-cn/**/*
- - docs/de/**/*
- - docs/ru-ru/**/*
-CI:
- - .github/**/*
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index eb49888191..0000000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# General configuration
-
-# Pull request specific configuration
-pulls:
- staleLabel: awaiting changes
- # Number of days of inactivity before an Issue or Pull Request becomes stale
- daysUntilStale: 45
- # Number of days of inactivity before a stale Issue or Pull Request is closed.
- # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
- daysUntilClose: 30
- # Comment to post when marking as stale. Set to `false` to disable
- markComment: >
- Thank you for your contribution!
-
- This pull request has been automatically marked as stale because it has not had
- activity in the last 45 days. It will be closed in 30 days if no further activity occurs.
- Please feel free to give a status update now, or re-open when it's ready.
-
- For maintainers: Please label with `awaiting review`, `breaking_change`, `in progress`, or `on hold` to prevent
- the issue from being re-flagged.
- # Comment to post when closing a stale Issue or Pull Request.
- closeComment: >
- Thank you for your contribution!
-
- This pull request has been automatically closed because it has not had activity in the last 30 days.
- Please feel free to give a status update now, ping for review, or re-open when it's ready.
- # Limit the number of actions per hour, from 1-30. Default is 30
- limitPerRun: 30
- exemptLabels:
- - awaiting review
- - breaking_change
- - in progress
- - on hold
-
-# Issue specific configuration
-issues:
- staleLabel: stale
- limitPerRun: 10
- daysUntilStale: 90
- daysUntilClose: 30
- markComment: >
- This issue has been automatically marked as stale because it has not had activity in the
- last 90 days. It will be closed in the next 30 days unless it is tagged properly or other activity
- occurs.
-
- For maintainers: Please label with `bug`, `in progress`, `on hold`, `discussion` or `to do` to prevent
- the issue from being re-flagged.
- closeComment: >
- This issue has been automatically closed because it has not had activity in the last 30 days.
- If this issue is still valid, re-open the issue and let us know.
- exemptLabels:
- - bug
- - in progress
- - on hold
- - discussion
- - to do
diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
deleted file mode 100644
index dea3f017dd..0000000000
--- a/.github/workflows/auto_approve.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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/"
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
deleted file mode 100644
index 90159406a6..0000000000
--- a/.github/workflows/develop_update.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Update develop after master merge
-
-on:
- push:
- branches:
- - master
-
-jobs:
- develop_update:
- runs-on: ubuntu-latest
-
- if: github.repository == 'qmk/qmk_firmware'
-
- 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: Update develop from master
- run: |
- git config --global user.name "QMK Bot"
- git config --global user.email "hello@qmk.fm"
- git merge origin/master
- git push origin develop
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
deleted file mode 100644
index 98d3616ad1..0000000000
--- a/.github/workflows/feature_branch_update.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-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 "hello@qmk.fm"
- git merge origin/develop
- git push origin ${{ matrix.branch }}
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index ba0a86aa78..b6ce4063fe 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -19,7 +19,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
index 2f5b679499..f9c691bdd4 100644
--- a/.github/workflows/format_push.yml
+++ b/.github/workflows/format_push.yml
@@ -12,10 +12,14 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
+ - name: Disable automatic eol conversion
+ run: |
+ echo "* -text" > .git/info/attributes
+
- name: Install dependencies
run: |
pip3 install -r requirements-dev.txt
@@ -36,7 +40,7 @@ jobs:
git config user.email 'hello@qmk.fm'
- name: Create Pull Request
- uses: peter-evans/create-pull-request@v3
+ uses: peter-evans/create-pull-request@v4
if: ${{ github.repository == 'qmk/qmk_firmware'}}
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
deleted file mode 100644
index 3b99a8f43e..0000000000
--- a/.github/workflows/labeler.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: "Pull Request Labeler"
-
-on:
- pull_request_target:
- types: [opened, synchronize, reopened, ready_for_review, locked]
-
-jobs:
- triage:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/labeler@main
- with:
- repo-token: "${{ secrets.GITHUB_TOKEN }}"
- configuration-path: '.github/labeler.yml'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c7a8624ee1..5b8a45f26b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,10 +12,13 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
+ - name: Install dependencies
+ run: pip3 install -r requirements-dev.txt
+
- uses: trilom/file-changes-action@v1.2.4
id: file_changes
with:
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 60d51ce321..6f03a976ea 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -22,7 +22,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
submodules: recursive
- name: Install dependencies