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

Bringing the tree up to formatting parity with clang-format, shellcheck, shfmt, yaml linting, and MD lint #432

Merged
merged 13 commits into from
Apr 21, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ RUN apt-get -fy install git vim emacs sudo \
iproute2 procps lsb-release \
bash-completion \
build-essential cmake cppcheck valgrind \
wget curl telnet bsdtar
wget curl telnet bsdtar \
docker.io
RUN groupadd --gid $USER_GID $USERNAME
RUN useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME
RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
Expand All @@ -29,4 +30,9 @@ RUN cd /var/downloads
RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix | bsdtar -xvf - extension
RUN mkdir -p /home/vscode/.vscode-server/extensions
RUN mv extension /home/vscode/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
RUN mkdir -p /home/vscode/bin
RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /home/vscode/bin/restyle-path
RUN chmod +x /home/vscode/bin/restyle-path
RUN chown -R vscode:vscode /home/vscode


20 changes: 10 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"remoteUser": "vscode",
// Add the IDs of extensions you want installed when the container is created in the array below.
"extensions": [
"ms-azuretools.vscode-docker",
"xaver.clang-format",
"github.vscode-pull-request-github",
"maelvalais.autoconf",
"yzhang.markdown-all-in-one",
"eamodio.gitlens",
"yuichinukiyama.vscode-preview-server",
"aaron-bond.better-comments",
"foxundermoon.shell-format"
],
"ms-azuretools.vscode-docker",
"xaver.clang-format",
"github.vscode-pull-request-github",
"maelvalais.autoconf",
"yzhang.markdown-all-in-one",
"eamodio.gitlens",
"yuichinukiyama.vscode-preview-server",
"aaron-bond.better-comments",
"foxundermoon.shell-format"
],
// Use 'settings' to set *default* container specific settings.json values on container create.
// You can edit these settings after create using File > Preferences > Settings > Remote.
"settings": {
Expand Down
8 changes: 8 additions & 0 deletions .restyled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ exclude:
- "third_party/**/*"
- "third_party/**"
- "third_party/*"
- "third_party"
- "**/third_party/**/*"
- "**/third_party/*"
- "**/third_party/**"
- "**/third_party/**/*"
- "examples/lock-app/efr32/third_party/**/*"
- "examples/lock-app/efr32/third_party/*"
- "examples/lock-app/efr32/third_party/**"
- "build/**/*"
- "autom4te.cache/**/*"

Expand Down
107 changes: 51 additions & 56 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,86 +1,81 @@
# Project CHIP Open Source Code of Conduct

This Project CHIP Open Source – Code of Conduct applies to all those
contributing to, participating in, or maintaining the Project CHIP
open source project, including Zigbee Alliance members and
non-members.
This Project CHIP Open Source Code of Conduct applies to all those contributing
to, participating in, or maintaining the Project CHIP open source project,
including Zigbee Alliance members and non-members.

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to make participation in our
project and our community a harassment-free experience for everyone,
regardless of age, body size, disability, ethnicity, sex
characteristics, gender identity and expression, level of experience,
education, socio-economic status, nationality, personal appearance,
race, religion, or sexual identity and orientation.
contributors and maintainers pledge to make participation in our project and our
community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and
expression, level of experience, education, socio-economic status, nationality,
personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive
environment include:
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of violent threats, abusive, discriminatory, or derogatory language
* The use of sexualized language or imagery and unwelcome sexual
attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or
electronic address, without explicit permission
* Posting of violent content
* Engaging in unwanted physical contact
* Other conduct which could reasonably be considered inappropriate in
a professional setting
* Advocating for or encouraging any of the above behaviors
- The use of violent threats, abusive, discriminatory, or derogatory language
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Posting of violent content
- Engaging in unwanted physical contact
- Other conduct which could reasonably be considered inappropriate in a
professional setting
- Advocating for or encouraging any of the above behaviors

## Our Responsibilities

Project maintainers are expected to take appropriate and fair
corrective action in response to any instances of unacceptable
behavior. Project maintainers have the right and responsibility to
remove, edit, or reject comments, commits, code, wiki edits, issues,
and other contributions that are not aligned to this Code of Conduct,
or to ban temporarily or permanently any contributor for other
behaviors that they deem inappropriate, threatening, offensive, or
harmful.
Project maintainers are expected to take appropriate and fair corrective action
in response to any instances of unacceptable behavior. Project maintainers have
the right and responsibility to remove, edit, or reject comments, commits, code,
wiki edits, issues, and other contributions that are not aligned to this Code of
Conduct, or to ban temporarily or permanently any contributor for other
behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies within all project spaces, and it also
applies when an individual is representing the project or its
community in public spaces. Examples of representing a project or
community include using an official project e-mail address, posting
via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a
project may be further defined and clarified by project maintainers.
This Code of Conduct applies within all project spaces, and it also applies when
an individual is representing the project or its community in public spaces.
Examples of representing a project or community include using an official
project e-mail address, posting via an official social media account, or acting
as an appointed representative at an online or offline event. Representation of
a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior
may be reported by contacting the Project CHIP open source team at
[INSERT EMAIL ADDRESS]. All complaints will be reviewed and
investigated and will result in a response that is deemed necessary
and appropriate to the circumstances. The Project CHIP open source
team should maintain confidentiality with regard to the reporter of an
incident. Further details of specific enforcement policies may be
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the Project CHIP open source team at [INSERT EMAIL
ADDRESS]. All complaints will be reviewed and investigated and will result in a
response that is deemed necessary and appropriate to the circumstances. The
Project CHIP open source team should maintain confidentiality with regard to the
reporter of an incident. Further details of specific enforcement policies may be
posted separately.

Project maintainers who do not follow or enforce the Code of Conduct
in good faith may face temporary or permanent repercussions as
determined by Project CHIP open source leadership.
Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by Project
CHIP open source leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.4, available at
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

Expand Down
Loading