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.

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

Fix unknown key 'IndentPPDirectives' on CI #7933

Merged
merged 1 commit into from
Jan 19, 2020

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Jan 18, 2020

Description

clang-format is not currently being run on core files. From https://travis-ci.org/qmk/qmk_firmware/builds/622207692?utm_source=github_status&utm_medium=notification,

0.21s$ bash util/travis_compiled_push.sh
id_rsa_qmk_firmware
id_rsa_qmk.fm
Agent pid 16033
Identity added: id_rsa_qmk_firmware (id_rsa_qmk_firmware)
Using git hash 201c5bf
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
dos2unix: converting file quantum/encoder.c to Unix format ...
YAML:15:21: error: unknown key 'IndentPPDirectives'
IndentPPDirectives: AfterHash
                    ^~~~~~~~~
Error reading /home/travis/build/qmk/qmk_firmware/.clang-format: Invalid argument

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.
  • 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).

@zvecr zvecr added the bug label Jan 18, 2020
@zvecr zvecr requested a review from a team January 18, 2020 23:40
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

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.

Looks good to me.

Copy link
Member

@drashna drashna 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))

@drashna drashna merged commit 65f7bfc into qmk:master Jan 19, 2020
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@zvecr zvecr deleted the feature/fix_clang_format branch April 28, 2020 01:09
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants