Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move non-assignment code to post_rules.mk #14207

Merged
merged 19 commits into from
Sep 10, 2021
Merged

Move non-assignment code to post_rules.mk #14207

merged 19 commits into from
Sep 10, 2021

Conversation

skullydazed
Copy link
Member

@skullydazed skullydazed commented Aug 29, 2021 •
edited
Loading

Description

Types of Changes

  • Bugfix
  • Keyboard (addition or update)

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Base automatically changed from rules_lint to develop August 29, 2021 02:38
@github-actions github-actions bot added cli qmk cli command python labels Aug 29, 2021
@skullydazed
Copy link
Member Author

@mtei I have not done anything with helix. It reports the error I'm cleaning up in this PR. My assumption is that you're working on changes now that #8422 has been merged.

☒ helix/pico/qmk_conf: Non-assignment code found in rules.mk. Move it to post_rules.mk instead.
☒ Non-assignment code on line +3 keyboards/helix/pico/qmk_conf/rules.mk: include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
☒ helix/rev2/qmk_conf: Non-assignment code found in rules.mk. Move it to post_rules.mk instead.
☒ Non-assignment code on line +3 keyboards/helix/rev2/qmk_conf/rules.mk: include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))

@github-actions github-actions bot removed python cli qmk cli command labels Aug 29, 2021
@skullydazed
Copy link
Member Author

If you have been pinged in this comment you have a keyboard that is being changed by this PR: @Legonut @yohewi @GoTakigawa @mschwingen @KamoNanban @lfkeyboards @mtei @germ @hsgw @sigma @milestogo @filoxo

@skullydazed skullydazed marked this pull request as ready for review August 29, 2021 04:09
@skullydazed skullydazed requested a review from a team August 29, 2021 04:10
@mtei
Copy link
Contributor

mtei commented Aug 29, 2021

@mtei I have not done anything with helix. It reports the error I'm cleaning up in this PR. My assumption is that you're working on changes now that #8422 has been merged.

OKey.
Now I am working on #14216.

hsgw
hsgw approved these changes Aug 29, 2021
View reviewed changes
Copy link
Contributor

@hsgw hsgw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks fine for my keyboard. Thanks for letting me know.

@mtei
Copy link
Contributor

mtei commented Aug 29, 2021

Can you change the following so that when I edit keyboards/handwired/symmetric70_proto/local_features.mk in the master branch, it will be merged into the develop branch without conflicts?

https://github.com/mtei/qmk_firmware/tree/modify_14207_symmetric70_proto

@skullydazed
Copy link
Member Author

Can you change the following so that when I edit keyboards/handwired/symmetric70_proto/local_features.mk in the master branch, it will be merged into the develop branch without conflicts?

https://github.com/mtei/qmk_firmware/tree/modify_14207_symmetric70_proto

I've reverted that commit so that you can change that however you'd like.

@skullydazed skullydazed requested a review from a team August 29, 2021 23:54
@skullydazed skullydazed merged commit c94cc1e into develop Sep 10, 2021
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Sep 10, 2021
Merge remote-tracking branch 'qmk/develop' into develop
2ba6820 
* qmk/develop: (31 commits)
  Remove BLUETOOTH_ENABLE from defaultish keymaps (qmk#14375)
  Change USBasp and bootloadHID bootloaders to lowercase (qmk#14354)
  Move non-assignment code to post_rules.mk (qmk#14207)
  Fix number of elements in info.json does not match errors (qmk#14213)
  Remove bootloader listings from rules.mk (qmk#14330)
  Remove commented out BLUETOOTH_ENABLE rules (qmk#14361)
  Align rgb/led matrix docs with current behaviour (qmk#14367)
  [Keyboard] Add custom pcb for Polaris (qmk#14347)
  Fix CRLF in lyra/rev1 (qmk#14360)
  [Keyboard] add lyra (qmk#13977)
  [Keyboard] Add Olly JF PCB (qmk#14056)
  Backport F_CPU/F_USB hack from system76 (qmk#14286)
  [Keymap] Fix Maker Keyboards Alexa Keymap (qmk#14355)
  [Keyboard] Add 61Key (qmk#14259)
  `ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same (qmk#14315)
  `OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same (qmk#14302)
  [Keyboard] Minor tweaks to Work Board layout (qmk#14351)
  Bugfix for Joystick and JSON schema (qmk#14295)
  [Keyboard] Add new Mokey keyboard (qmk#14329)
  [Keymap] Add Gaston's Lily58 custom keymap (qmk#14334)
  ...
@drashna drashna deleted the rules_post_rules branch November 23, 2021 15:40
ptrxyz pushed a commit to ptrxyz/qmk_firmware that referenced this pull request Apr 9, 2022
@skullydazed @ptrxyz
Move non-assignment code to post_rules.mk (qmk#14207)
e5b714c 
* 40percentclub/ut47: move non-assignment code to post_rules.mk

* converter/palm_usb: move non-assignment code to post_rules.mk

* converter/sun_usb: move non-assignment code to post_rules.mk

* dm9records/ergoinu: move non-assignment code to post_rules.mk

* ergotaco: move non-assignment code to post_rules.mk

* handwired/symmetric70_proto: move non-assignment code to post_rules.mk

* hhkb/ansi: move non-assignment code to post_rules.mk

* hhkb/jp: move non-assignment code to post_rules.mk

* lfkeyboards/lfk78: move non-assignment code to post_rules.mk

* lfkeyboards/lfk87: move non-assignment code to post_rules.mk

* lfkeyboards/lfkpad: move non-assignment code to post_rules.mk

* lfkeyboards/mini1800: move non-assignment code to post_rules.mk

* manta60: move non-assignment code to post_rules.mk

* mschwingen/modelm: move non-assignment code to post_rules.mk

* newgame40: move non-assignment code to post_rules.mk

* numatreus: move non-assignment code to post_rules.mk

* rgbkb/zen: move non-assignment code to post_rules.mk

* rgbkb/zen/rev2: move non-assignment code to post_rules.mk

* Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk"

This reverts commit cffaf00.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark left review comments

@yohewi yohewi yohewi approved these changes

@filoxo filoxo filoxo approved these changes

@hsgw hsgw hsgw approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@skullydazed @mtei @drashna @hsgw @filoxo @fauxpark @yohewi