Skip to content

Commit

Permalink
Merge pull request qmk#22 from sadekbaroudi/develop_fingerpunch
Browse files Browse the repository at this point in the history
merge qmk 20230226 release into fingerpunch master
  • Loading branch information
sadekbaroudi authored Mar 27, 2023
2 parents 584e94f + b71ff4e commit b6d50bc
Show file tree
Hide file tree
Showing 12,453 changed files with 144,407 additions and 117,087 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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.
1 change: 1 addition & 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
3 changes: 3 additions & 0 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Update API Data

permissions:
contents: read

on:
push:
branches:
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
5 changes: 4 additions & 1 deletion .github/workflows/auto_tag.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Essential files modified

permissions:
contents: write

on:
push:
branches:
Expand Down Expand Up @@ -28,7 +31,7 @@ jobs:
fetch-depth: 0

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.55.0
uses: anothrNick/github-tag-action@1.61.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
40 changes: 40 additions & 0 deletions .github/workflows/ci_builds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: CI Builds

permissions:
contents: read

on:
push:
branches:
- master
- develop

jobs:
ci_builds:
name: "CI Build"
runs-on: self-hosted
timeout-minutes: 1380

if: github.repository == 'qmk/qmk_firmware'

strategy:
matrix:
keymap:
- default
- via

container: qmkfm/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.txt

- name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
run: qmk mass-compile -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) -km ${{ matrix.keymap }}
7 changes: 7 additions & 0 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 @@ -18,9 +21,13 @@ jobs:
container: qmkfm/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
Expand Down
3 changes: 3 additions & 0 deletions .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 Down
3 changes: 3 additions & 0 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 Down
3 changes: 3 additions & 0 deletions .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 Down
14 changes: 9 additions & 5 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: PR Lint Format

permissions:
contents: read

on:
pull_request:
paths:
Expand All @@ -19,6 +22,9 @@ jobs:
container: qmkfm/qmk_cli

steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'

- uses: actions/checkout@v3
with:
fetch-depth: 0
Expand All @@ -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@v35

- 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
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/format_push.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Lint Format

permissions:
contents: read

on:
push:
branches:
Expand All @@ -13,6 +16,9 @@ jobs:
container: qmkfm/qmk_cli

steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'

- uses: actions/checkout@v3
with:
fetch-depth: 0
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
26 changes: 21 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: PR Lint keyboards

permissions:
contents: read

on:
pull_request:
paths:
Expand All @@ -12,31 +15,34 @@ jobs:
container: qmkfm/qmk_cli

steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'

- 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
- name: Get changed files
id: file_changes
with:
output: '\n'
uses: tj-actions/changed-files@v35

- name: Print info
run: |
git rev-parse --short HEAD
echo ${{ github.event.pull_request.base.sha }}
echo '${{ steps.file_changes.outputs.files}}'
echo '${{ steps.file_changes.outputs.all_changed_files}}'
- name: Run qmk lint
shell: 'bash {0}'
run: |
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.files}}')
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.all_changed_files}}' | sed 's/ /\n/g')
QMK_KEYBOARDS=$(qmk list-keyboards)
exit_code=0
for KB in $QMK_KEYBOARDS; do
KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
if [[ -z "$KEYBOARD_CHANGES" ]]; then
Expand All @@ -52,6 +58,16 @@ jobs:
exit_code=$(($exit_code + $?))
fi
done
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))
fi
done
if [[ $exit_code -gt 255 ]]; then
exit 255
fi
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/regen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: PR Regenerate Files

permissions:
contents: read

on:
pull_request:
paths:
- 'data/constants/**'
- 'lib/python/**'

jobs:
regen:
runs-on: ubuntu-latest

container: qmkfm/qmk_cli

steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'

- uses: actions/checkout@v3

- name: Run qmk generators
run: |
util/regen.sh
git diff
- name: Fail when regeneration required
run: |
git diff
for file in $(git diff --name-only); do
echo "File '${file}' Requires Regeneration"
echo "::error file=${file}::Requires Regeneration"
done
test -z "$(git diff --name-only)"
46 changes: 46 additions & 0 deletions .github/workflows/regen_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Regenerate Files

permissions:
contents: write

on:
push:
branches:
- master
- develop

jobs:
regen:
runs-on: ubuntu-latest

container: qmkfm/qmk_cli

steps:
- name: Disable safe.directory check
run : git config --global --add safe.directory '*'

- uses: actions/checkout@v3

- name: Run qmk generators
run: |
util/regen.sh
git diff
- uses: rlespinasse/github-slug-action@v3.x

- name: Become QMK Bot
run: |
git config user.name 'QMK Bot'
git config user.email 'hello@qmk.fm'
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
if: ${{ github.repository == 'qmk/qmk_firmware'}}
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
delete-branch: true
branch: bugfix/regen_${{ env.GITHUB_REF_SLUG }}
author: QMK Bot <hello@qmk.fm>
committer: QMK Bot <hello@qmk.fm>
commit-message: Regenerate Files
title: '[CI] Regenerate Files'
Loading

0 comments on commit b6d50bc

Please sign in to comment.