From 56f05f494c21f6fc0679c5db2743e413660e55d3 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 16 Jan 2023 20:43:33 +0000 Subject: [PATCH 1/2] Clean up remaining mentions of the deprecated Space B reset method --- .github/workflows/auto_tag.yml | 37 -------------------------- keyboards/alf/x2/readme.md | 2 +- keyboards/charue/sunsetter/readme.md | 2 +- keyboards/mechkeys/acr60/readme.md | 2 +- keyboards/mechkeys/alu84/readme.md | 2 +- keyboards/misonoworks/karina/readme.md | 2 +- keyboards/mt/mt84/readme.md | 2 +- 7 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/auto_tag.yml diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml deleted file mode 100644 index 07490a046456..000000000000 --- a/.github/workflows/auto_tag.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Essential files modified - -permissions: - contents: write - -on: - push: - branches: - - master - paths: - - builddefs/**/* - - drivers/**/* - - platforms/**/* - - quantum/**/* - - tests/**/* - - tmk_core/**/* - - util/**/* - - 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@v3 - with: - fetch-depth: 0 - - - name: Bump version and push tag - uses: anothrNick/github-tag-action@1.61.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DEFAULT_BUMP: 'patch' diff --git a/keyboards/alf/x2/readme.md b/keyboards/alf/x2/readme.md index 671155a341c5..bd1e9f8b2e9f 100644 --- a/keyboards/alf/x2/readme.md +++ b/keyboards/alf/x2/readme.md @@ -16,6 +16,6 @@ Flashing example for this keyboard: make alf/x2:default:flash -To reset the board into bootloader mode, hold Space+B while plugging it in. +To reset the board into bootloader mode, the key at top left (usually escape) while plugging it in. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/charue/sunsetter/readme.md b/keyboards/charue/sunsetter/readme.md index 84c0f3ed79ff..a761e151be5e 100644 --- a/keyboards/charue/sunsetter/readme.md +++ b/keyboards/charue/sunsetter/readme.md @@ -10,7 +10,7 @@ A 65 + 10% F-Key Column Keyboard kit made and sold by Charue Design. [More info #### Jumping to Bootloader -To enter the bootloader, you may use bootmagic by holding `Space+B` or by holding the reset button located at the back of the PCB, right beside the left shift key, for a few seconds. +To enter the bootloader, you may use bootmagic by holding the key at top left (usually escape) or by holding the reset button located at the back of the PCB, right beside the left shift key, for a few seconds. Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/mechkeys/acr60/readme.md b/keyboards/mechkeys/acr60/readme.md index 4d8bffa36414..560e1d12d608 100644 --- a/keyboards/mechkeys/acr60/readme.md +++ b/keyboards/mechkeys/acr60/readme.md @@ -19,6 +19,6 @@ Flashing example for this keyboard: To reset the board into bootloader mode, do one of the following: * Tap the Reset switch mounted on the bottom side of the PCB -* Hold Space+B while connecting the USB cable +* Hold the key at top left (usually escape) while connecting the USB cable See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).` diff --git a/keyboards/mechkeys/alu84/readme.md b/keyboards/mechkeys/alu84/readme.md index ca2afbe970b2..a1d524d41a1f 100644 --- a/keyboards/mechkeys/alu84/readme.md +++ b/keyboards/mechkeys/alu84/readme.md @@ -16,6 +16,6 @@ Flashing example for this keyboard: make mechkeys/alu84:default:flash -To reset the board into bootloader mode, hold Space+B while plugging the cable in. +To reset the board into bootloader mode, hold the key at top left (usually escape) while plugging the cable in. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/misonoworks/karina/readme.md b/keyboards/misonoworks/karina/readme.md index debd418b39d5..ae0648a3aa8c 100644 --- a/keyboards/misonoworks/karina/readme.md +++ b/keyboards/misonoworks/karina/readme.md @@ -16,6 +16,6 @@ Flashing example for this keyboard: make misonoworks/karina:default:flash -To reset the board into bootloader mode, hold Space+B while connecting the USB cable. +To reset the board into bootloader mode, hold the key at top left (usually escape) while connecting the USB cable. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/mt/mt84/readme.md b/keyboards/mt/mt84/readme.md index f26521ad6ab6..af641502a9ac 100644 --- a/keyboards/mt/mt84/readme.md +++ b/keyboards/mt/mt84/readme.md @@ -18,6 +18,6 @@ Flashing example for this keyboard: make mt/mt84:default:flash -To put the board into bootloader mode, either press the reset button on the bottom the PCB or hold Space+B while plugging it in. +To put the board into bootloader mode, either press the reset button on the bottom the PCB or hold the key at top left (usually escape) while plugging it in. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 96f94cb41b54e226fc4ef6b86e4a5c2ed43696d6 Mon Sep 17 00:00:00 2001 From: Tom Barnes Date: Mon, 16 Jan 2023 20:50:22 +0000 Subject: [PATCH 2/2] cleanup auto_tag.yml that got sucked in --- .github/workflows/auto_tag.yml | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/auto_tag.yml diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml new file mode 100644 index 000000000000..07490a046456 --- /dev/null +++ b/.github/workflows/auto_tag.yml @@ -0,0 +1,37 @@ +name: Essential files modified + +permissions: + contents: write + +on: + push: + branches: + - master + paths: + - builddefs/**/* + - drivers/**/* + - platforms/**/* + - quantum/**/* + - tests/**/* + - tmk_core/**/* + - util/**/* + - 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@v3 + with: + fetch-depth: 0 + + - name: Bump version and push tag + uses: anothrNick/github-tag-action@1.61.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DEFAULT_BUMP: 'patch'