Skip to content

Commit 8411d43

Browse files
committed
add CODEOWNERS, CoC; tweak bors and Travis
1 parent df26fc1 commit 8411d43

File tree

4 files changed

+55
-3
lines changed

4 files changed

+55
-3
lines changed

cortex-m-rt/.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @rust-embedded/cortex-m

cortex-m-rt/.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,87 @@ language: rust
33
matrix:
44
include:
55
- env: TARGET=x86_64-unknown-linux-gnu
6+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
67

78
- env: TARGET=thumbv6m-none-eabi
89
rust: stable
910
addons:
1011
apt:
1112
packages:
1213
- gcc-arm-none-eabi
14+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
1315

1416
- env: TARGET=thumbv6m-none-eabi CC=clang
1517
rust: stable
18+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
1619

1720
- env: TARGET=thumbv7m-none-eabi
1821
rust: stable
1922
addons:
2023
apt:
2124
packages:
2225
- gcc-arm-none-eabi
26+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
2327

2428
- env: TARGET=thumbv7m-none-eabi CC=clang
2529
rust: stable
30+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
2631

2732
- env: TARGET=thumbv7em-none-eabi
2833
rust: stable
2934
addons:
3035
apt:
3136
packages:
3237
- gcc-arm-none-eabi
38+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
3339

3440
- env: TARGET=thumbv7em-none-eabi CC=clang
3541
rust: stable
42+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
3643

3744
- env: TARGET=thumbv7em-none-eabihf
3845
rust: stable
3946
addons:
4047
apt:
4148
packages:
4249
- gcc-arm-none-eabi
50+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
4351

4452
- env: TARGET=thumbv7em-none-eabihf CC=clang
4553
rust: stable
54+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
4655

4756
- env: TARGET=thumbv6m-none-eabi
4857
rust: nightly
4958
addons:
5059
apt:
5160
packages:
5261
- gcc-arm-none-eabi
62+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
5363

5464
- env: TARGET=thumbv7m-none-eabi
5565
rust: nightly
5666
addons:
5767
apt:
5868
packages:
5969
- gcc-arm-none-eabi
70+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
6071

6172
- env: TARGET=thumbv7em-none-eabi
6273
rust: nightly
6374
addons:
6475
apt:
6576
packages:
6677
- gcc-arm-none-eabi
78+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
6779

6880
- env: TARGET=thumbv7em-none-eabihf
6981
rust: nightly
7082
addons:
7183
apt:
7284
packages:
7385
- gcc-arm-none-eabi
86+
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
7487

7588
before_install: set -e
7689

@@ -89,6 +102,7 @@ before_cache:
89102

90103
branches:
91104
only:
105+
- master
92106
- staging
93107
- trying
94108

cortex-m-rt/CODE_OF_CONDUCT.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# The Rust Code of Conduct
2+
3+
## Conduct
4+
5+
**Contact**: [Cortex-M team](https://github.com/rust-embedded/wg#the-cortex-m-team)
6+
7+
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
8+
* On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
9+
* Please be kind and courteous. There's no need to be mean or rude.
10+
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
11+
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
12+
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
13+
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Cortex-M team][team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
14+
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
15+
16+
## Moderation
17+
18+
These are the policies for upholding our community's standards of conduct.
19+
20+
1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
21+
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
22+
3. Moderators will first respond to such remarks with a warning.
23+
4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of the communication channel to cool off.
24+
5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
25+
6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
26+
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, **in private**. Complaints about bans in-channel are not allowed.
27+
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.
28+
29+
In the Rust community we strive to go the extra step to look out for each other. Don't just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they're off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.
30+
31+
And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
32+
33+
The enforcement policies listed above apply to all official embedded WG venues; including official IRC channels (#rust-embedded); GitHub repositories under rust-embedded; and all forums under rust-embedded.org (forum.rust-embedded.org).
34+
35+
*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
36+
37+
[team]: https://github.com/rust-embedded/wg#the-cortex-m-team

cortex-m-rt/bors.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
status = [
2-
"continuous-integration/travis-ci/push",
3-
]
1+
delete_merged_branches = true
2+
required_approvals = 1
3+
status = ["continuous-integration/travis-ci/push"]

0 commit comments

Comments
 (0)