Skip to content

Commit

Permalink
Merge branch 'master' into sjb/all-keyboard
Browse files Browse the repository at this point in the history
* master: (708 commits)
  zweihander-macos: Update keys, add capslock (qmk#19730)
  [Keyboard] Add modded Razer Orbweaver with RP2040 (qmk#19711)
  add Mecx Labs mp1 macropad (qmk#19064)
  Accumulate version.h generator flags. (qmk#19716)
  Clean up `qmk generate-autocorrect-data` (qmk#19710)
  Add base firmware for the Frog Numpad (qmk#19698)
  [Keyboard] Baion 808 (qmk#19690)
  Additional handedness by EEPROM examples (qmk#19686)
  VIA keymap for Reviung 34. (qmk#19694)
  [Keyboard] Update effects for Keychron Q2 (qmk#19685)
  Swap LED_PIN_ON_STATE to 0. (qmk#19692)
  Add RP2040 SCRAMBLE v2 (qmk#19489)
  VIA keymap for the dactyl manuform 4x6 (qmk#19668)
  Rename `LAYOUT` macros identifier that contained the keyboard name (qmk#19657)
  new keyboard: edinburgh41 (qmk#19569)
  Decrease LED animation frequency to improve performance (qmk#19677)
  [Keymap] Update brauner preonic layout (qmk#19665)
  Update understanding_qmk.md (qmk#19664)
  escaped stray backslash in bux.py (qmk#19667)
  [Keyboard] Add the Black Hellebore (qmk#19655)
  ...
  • Loading branch information
SjB committed Feb 2, 2023
2 parents 3887dd4 + 8dc6686 commit 54323ea
Show file tree
Hide file tree
Showing 11,205 changed files with 199,899 additions and 109,359 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
15 changes: 12 additions & 3 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 @@ -17,7 +21,7 @@ jobs:
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:
Expand All @@ -26,15 +30,20 @@ jobs:
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
12 changes: 8 additions & 4 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 @@ -27,7 +31,7 @@ jobs:
fetch-depth: 0

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.52.0
uses: anothrNick/github-tag-action@1.61.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
3 changes: 3 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 Down
43 changes: 0 additions & 43 deletions .github/workflows/develop_api.yml

This file was deleted.

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
5 changes: 4 additions & 1 deletion .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 Expand Up @@ -34,7 +37,7 @@ jobs:
qmk --verbose generate-docs
- name: Deploy
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE_BRANCH: master
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
3 changes: 3 additions & 0 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 Down
3 changes: 3 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 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
3 changes: 3 additions & 0 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 Down
11 changes: 6 additions & 5 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
name: 'Close stale issues and PRs'
on:
schedule:
- cron: '30 1 * * *'
workflow_dispatch:

permissions:
issues: write
pull-requests: write

on:
schedule:
- cron: '30 1 * * *'
workflow_dispatch:

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v6
- uses: actions/stale@v7
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Unit Tests

permissions:
contents: read

on:
push:
branches:
Expand Down
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ quantum/version.h
build/
cmake-build-debug
CMakeLists.txt
*.pdf

# Let these ones be user specific, since we have so many different configurations
*.code-workspace
Expand All @@ -67,9 +68,20 @@ CMakeLists.txt
tags

# Ignore image/font files
*.bmp
*.wbmp
*.gif
*.jpg
*.jpeg
*.png
*.apng
*.mng
*.svg
*.webp
*.webm
*.avi
*.mp4
*.mpeg
*.ttf
*.otf

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ endef
# if we are going to compile all keyboards, match the rest of the rule
# for each of them
define PARSE_ALL_KEYBOARDS
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh noci | sort -u)))
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh | sort -u)))
endef

# Prints a list of all known keymaps for the given keyboard
Expand Down
Loading

0 comments on commit 54323ea

Please sign in to comment.