forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request qmk#1 from HannesHasselbring/master
Update
- Loading branch information
Showing
8,737 changed files
with
267,668 additions
and
200,868 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
name: Update API Data | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
paths: | ||
- 'keyboards/**' | ||
- 'layouts/community/**' | ||
|
||
jobs: | ||
api_data: | ||
runs-on: ubuntu-latest | ||
container: qmkfm/base_container | ||
|
||
# protect against those who develop with their fork on master | ||
if: github.repository == 'qmk/qmk_firmware' | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 1 | ||
persist-credentials: false | ||
|
||
- name: Generate API Data | ||
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_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' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
name: Essential files modified | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
paths: | ||
- quantum/**/* | ||
- tmk_core/**/* | ||
- drivers/**/* | ||
- tests/**/* | ||
- util/**/* | ||
- platforms/**/* | ||
- Makefile | ||
- '*.mk' | ||
|
||
jobs: | ||
tag: | ||
runs-on: ubuntu-latest | ||
|
||
# protect against those who develop with their fork on master | ||
if: github.repository == 'qmk/qmk_firmware' | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Bump version and push tag | ||
uses: anothrNick/github-tag-action@1.26.0 | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
DEFAULT_BUMP: 'patch' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
name: Update Develop API Data | ||
|
||
on: | ||
push: | ||
branches: | ||
- develop | ||
paths: | ||
- 'keyboards/**' | ||
- 'layouts/community/**' | ||
|
||
jobs: | ||
api_data: | ||
runs-on: ubuntu-latest | ||
container: qmkfm/base_container | ||
|
||
# protect against those who work in their fork on develop | ||
if: github.repository == 'qmk/qmk_firmware' | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 1 | ||
persist-credentials: false | ||
|
||
- name: Generate API Data | ||
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_DEVELOP }} | ||
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' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
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: | ||
fetch-depth: 0 | ||
|
||
- name: Checkout develop | ||
run: | | ||
git fetch origin master develop | ||
git checkout develop | ||
- name: Check if branch locked | ||
id: check_locked | ||
uses: andstor/file-existence-action@v1 | ||
with: | ||
files: ".locked" | ||
|
||
- name: Update develop from master | ||
if: steps.check_locked.outputs.files_exists == 'false' | ||
run: | | ||
git config --global user.name "QMK Bot" | ||
git config --global user.email "hello@qmk.fm" | ||
git merge origin/master | ||
git push origin develop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
name: Generate Docs | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
paths: | ||
- 'tmk_core/**' | ||
- 'quantum/**' | ||
- 'platforms/**' | ||
- 'docs/**' | ||
- '.github/workflows/docs.yml' | ||
|
||
jobs: | ||
generate: | ||
runs-on: ubuntu-latest | ||
container: qmkfm/base_container | ||
|
||
# protect against those who develop with their fork on master | ||
if: github.repository == 'qmk/qmk_firmware' | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 1 | ||
|
||
- name: Install dependencies | ||
run: | | ||
apt-get update && apt-get install -y rsync nodejs npm doxygen | ||
npm install -g moxygen | ||
- name: Build docs | ||
run: | | ||
qmk --verbose generate-docs | ||
- name: Deploy | ||
uses: JamesIves/github-pages-deploy-action@3.7.1 | ||
with: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
BASE_BRANCH: master | ||
BRANCH: gh-pages | ||
FOLDER: .build/docs | ||
GIT_CONFIG_EMAIL: hello@qmk.fm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
name: Format Codebase | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
- develop | ||
|
||
jobs: | ||
format: | ||
runs-on: ubuntu-latest | ||
container: qmkfm/base_container | ||
|
||
# protect against those who develop with their fork on master | ||
if: github.repository == 'qmk/qmk_firmware' | ||
|
||
steps: | ||
- uses: rlespinasse/github-slug-action@v3.x | ||
|
||
- uses: actions/checkout@v2 | ||
with: | ||
token: ${{ secrets.API_TOKEN_GITHUB }} | ||
|
||
- name: Install dependencies | ||
run: | | ||
apt-get update && apt-get install -y dos2unix | ||
- name: Format files | ||
run: | | ||
bin/qmk cformat -a | ||
bin/qmk pyformat | ||
bin/qmk fileformat | ||
- 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@v3 | ||
with: | ||
delete-branch: true | ||
branch: bugfix/format_${{ env.GITHUB_REF_SLUG }} | ||
author: QMK Bot <hello@qmk.fm> | ||
committer: QMK Bot <hello@qmk.fm> | ||
commit-message: Format code according to conventions | ||
title: '[CI] Format code according to conventions' |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
name: PR Lint keyboards | ||
|
||
on: | ||
pull_request: | ||
paths: | ||
- 'keyboards/**' | ||
|
||
jobs: | ||
lint: | ||
runs-on: ubuntu-latest | ||
|
||
container: qmkfm/base_container | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- uses: trilom/file-changes-action@v1.2.4 | ||
id: file_changes | ||
with: | ||
output: '\n' | ||
|
||
- name: Print info | ||
run: | | ||
git rev-parse --short HEAD | ||
echo ${{ github.event.pull_request.base.sha }} | ||
echo '${{ steps.file_changes.outputs.files}}' | ||
- name: Run qmk lint | ||
shell: 'bash {0}' | ||
run: | | ||
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.files}}') | ||
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 | ||
# skip as no changes for this keyboard | ||
continue | ||
fi | ||
KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/) | ||
if [[ $KEYMAP_ONLY -gt 0 ]]; then | ||
echo "linting ${KB}" | ||
qmk lint --keyboard ${KB} && qmk info -l --keyboard ${KB} | ||
exit_code=$(($exit_code + $?)) | ||
fi | ||
done | ||
if [[ $exit_code -gt 255 ]]; then | ||
exit 255 | ||
fi | ||
exit $exit_code |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,6 +16,7 @@ | |
*.swp | ||
tags | ||
*~ | ||
api_data/v1 | ||
build/ | ||
.build/ | ||
*.bak | ||
|
Oops, something went wrong.