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

Swap git diff logic to github action when running qmk info #9978

Merged
merged 2 commits into from
Aug 17, 2020
Merged

Swap git diff logic to github action when running qmk info #9978

merged 2 commits into from
Aug 17, 2020

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Aug 8, 2020

Description

At the moment, PRs can sometime fail due to the current method of detecting changes. The scenario as I currently understand is as follows:

  1. Additional commits are added to master
  2. Additional commits are added to PR
  3. CI runs git diff .... which now reports the changes to master

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@tzarc
Copy link
Member

tzarc commented Aug 9, 2020

Seems ok, just needs a rollback on the test with the xd84?

@zvecr
Copy link
Member Author

zvecr commented Aug 12, 2020

Was waiting for part 1 of the theoretical scenario to confirm behaviour.

Before...

2020-08-12T18:49:44.2431104Z c7b56bee96b17a84a3de372117394b62191e22ce
2020-08-12T18:49:44.2484902Z .github/workflows/info.yml
2020-08-12T18:49:44.2485976Z bootloader.mk
2020-08-12T18:49:44.2488135Z keyboards/cannonkeys/instant65/keymaps/via/keymap.c
2020-08-12T18:49:44.2489816Z keyboards/cannonkeys/obliterated75/keymaps/via/keymap.c
2020-08-12T18:49:44.2491507Z keyboards/ergodox_infinity/bootloader_defs.h
2020-08-12T18:49:44.2491969Z keyboards/ergodox_infinity/rules.mk
2020-08-12T18:49:44.2492339Z keyboards/handwired/swiftrax/cowfish/config.h
2020-08-12T18:49:44.2492774Z keyboards/infinity60/bootloader_defs.h
2020-08-12T18:49:44.2498470Z keyboards/infinity60/rules.mk
2020-08-12T18:49:44.2498887Z keyboards/jian/keymaps/via/config.h
2020-08-12T18:49:44.2499176Z keyboards/jian/rev2/config.h
2020-08-12T18:49:44.2499450Z keyboards/k_type/bootloader_defs.h
2020-08-12T18:49:44.2499707Z keyboards/k_type/rules.mk
2020-08-12T18:49:44.2501905Z keyboards/nckiibs/flatbread60/config.h
2020-08-12T18:49:44.2502624Z keyboards/nckiibs/flatbread60/flatbread60.c
2020-08-12T18:49:44.2504129Z keyboards/nckiibs/flatbread60/flatbread60.h
2020-08-12T18:49:44.2504680Z keyboards/nckiibs/flatbread60/info.json
2020-08-12T18:49:44.2505034Z keyboards/nckiibs/flatbread60/keymaps/default/keymap.c
2020-08-12T18:49:44.2505300Z keyboards/nckiibs/flatbread60/keymaps/default/readme.md
2020-08-12T18:49:44.2505665Z keyboards/nckiibs/flatbread60/keymaps/via/keymap.c
2020-08-12T18:49:44.2506677Z keyboards/nckiibs/flatbread60/keymaps/via/rules.mk
2020-08-12T18:49:44.2506995Z keyboards/nckiibs/flatbread60/readme.md
2020-08-12T18:49:44.2507452Z keyboards/nckiibs/flatbread60/rules.mk
2020-08-12T18:49:44.2508195Z keyboards/nckiibs/vaneela/config.h
2020-08-12T18:49:44.2508632Z keyboards/nckiibs/vaneela/info.json
2020-08-12T18:49:44.2508977Z keyboards/nckiibs/vaneela/keymaps/default/keymap.c
2020-08-12T18:49:44.2509284Z keyboards/nckiibs/vaneela/keymaps/default/readme.md
2020-08-12T18:49:44.2509597Z keyboards/nckiibs/vaneela/keymaps/via/keymap.c
2020-08-12T18:49:44.2510718Z keyboards/nckiibs/vaneela/keymaps/via/rules.mk
2020-08-12T18:49:44.2511264Z keyboards/nckiibs/vaneela/readme.md
2020-08-12T18:49:44.2511604Z keyboards/nckiibs/vaneela/rules.mk
2020-08-12T18:49:44.2512305Z keyboards/nckiibs/vaneela/vaneela.c
2020-08-12T18:49:44.2512599Z keyboards/nckiibs/vaneela/vaneela.h
2020-08-12T18:49:44.2513133Z keyboards/nckiibs/vaneelaex/config.h
2020-08-12T18:49:44.2513458Z keyboards/nckiibs/vaneelaex/info.json
2020-08-12T18:49:44.2513731Z keyboards/nckiibs/vaneelaex/keymaps/default/keymap.c
2020-08-12T18:49:44.2514239Z keyboards/nckiibs/vaneelaex/keymaps/default/readme.md
2020-08-12T18:49:44.2515661Z keyboards/nckiibs/vaneelaex/keymaps/via/keymap.c
2020-08-12T18:49:44.2516084Z keyboards/nckiibs/vaneelaex/keymaps/via/rules.mk
2020-08-12T18:49:44.2518033Z keyboards/nckiibs/vaneelaex/readme.md
2020-08-12T18:49:44.2518849Z keyboards/nckiibs/vaneelaex/rules.mk
2020-08-12T18:49:44.2519232Z keyboards/nckiibs/vaneelaex/vaneelaex.c
2020-08-12T18:49:44.2519355Z keyboards/nckiibs/vaneelaex/vaneelaex.h
2020-08-12T18:49:44.2519510Z keyboards/whitefox/bootloader_defs.h
2020-08-12T18:49:44.2519665Z keyboards/whitefox/rules.mk
2020-08-12T18:49:44.2520579Z keyboards/xd84/info.json
2020-08-12T18:49:44.2520739Z keyboards/zvecr/zv48/info.json
2020-08-12T18:49:44.2520887Z tmk_core/chibios.mk
2020-08-12T18:49:44.2521059Z tmk_core/common/chibios/bootloader.c

now

2020-08-12T18:49:44.2521171Z .github/workflows/info.yml
2020-08-12T18:49:44.2521590Z keyboards/xd84/info.json
2020-08-12T18:49:44.2521760Z keyboards/zvecr/zv48/info.json

Seems solid so good to go once i force back out and force push.

@zvecr zvecr force-pushed the feature/ci_info_fix branch from 9ba2cf4 to 6019ad3 Compare August 12, 2020 18:54
@zvecr zvecr requested a review from a team August 12, 2020 18:56
fauxpark
fauxpark approved these changes Aug 12, 2020
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

#pragma weak

@drashna drashna requested a review from a team August 12, 2020 21:38
noroadsleft
noroadsleft approved these changes Aug 17, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

__attribute__ ((weak)) ✔️

@noroadsleft noroadsleft merged commit d02301e into qmk:master Aug 17, 2020
@noroadsleft
Copy link
Member

Thanks!

nicocesar pushed a commit to nicocesar/qmk_firmware that referenced this pull request Sep 6, 2020
@zvecr @nicocesar
Swap git diff logic to github action when running qmk info (qmk#9978)
48c12f1 
* swap git diff logic to github action

* Print out layouts when linting
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@zvecr
Swap git diff logic to github action when running qmk info (qmk#9978)
75ed82d 
* swap git diff logic to github action

* Print out layouts when linting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@tzarc tzarc tzarc approved these changes

@fauxpark fauxpark fauxpark approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@zvecr @tzarc @noroadsleft @drashna @fauxpark