From e4ec5048d8a69609849c880648c9e827a9f80925 Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Sun, 23 Jan 2022 21:40:54 +0000 Subject: [PATCH 1/2] Update URLs to reference new cross-rs organisation --- CHANGELOG.md | 38 +++++++++++++++++++------------------- CODE_OF_CONDUCT.md | 9 +++++---- Cargo.toml | 4 ++-- README.md | 12 ++++++++---- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 804e37b32..d2d7416bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -247,22 +247,22 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Initial release. Supports 12 targets. -[Unreleased]: https://github.com/rust-embedded/cross/compare/v0.2.1...HEAD -[v0.2.1]: https://github.com/rust-embedded/cross/compare/v0.2.0...v0.2.1 -[v0.2.0]: https://github.com/rust-embedded/cross/compare/v0.1.16...v0.2.0 -[v0.1.16]: https://github.com/rust-embedded/cross/compare/v0.1.15...v0.1.16 -[v0.1.15]: https://github.com/rust-embedded/cross/compare/v0.1.14...v0.1.15 -[v0.1.14]: https://github.com/rust-embedded/cross/compare/v0.1.13...v0.1.14 -[v0.1.13]: https://github.com/rust-embedded/cross/compare/v0.1.12...v0.1.13 -[v0.1.12]: https://github.com/rust-embedded/cross/compare/v0.1.11...v0.1.12 -[v0.1.11]: https://github.com/rust-embedded/cross/compare/v0.1.10...v0.1.11 -[v0.1.10]: https://github.com/rust-embedded/cross/compare/v0.1.9...v0.1.10 -[v0.1.9]: https://github.com/rust-embedded/cross/compare/v0.1.8...v0.1.9 -[v0.1.8]: https://github.com/rust-embedded/cross/compare/v0.1.7...v0.1.8 -[v0.1.7]: https://github.com/rust-embedded/cross/compare/v0.1.6...v0.1.7 -[v0.1.6]: https://github.com/rust-embedded/cross/compare/v0.1.5...v0.1.6 -[v0.1.5]: https://github.com/rust-embedded/cross/compare/v0.1.4...v0.1.5 -[v0.1.4]: https://github.com/rust-embedded/cross/compare/v0.1.3...v0.1.4 -[v0.1.3]: https://github.com/rust-embedded/cross/compare/v0.1.2...v0.1.3 -[v0.1.2]: https://github.com/rust-embedded/cross/compare/v0.1.1...v0.1.2 -[v0.1.1]: https://github.com/rust-embedded/cross/compare/v0.1.0...v0.1.1 +[Unreleased]: https://github.com/cross-rs/cross/compare/v0.2.1...HEAD +[v0.2.1]: https://github.com/cross-rs/cross/compare/v0.2.0...v0.2.1 +[v0.2.0]: https://github.com/cross-rs/cross/compare/v0.1.16...v0.2.0 +[v0.1.16]: https://github.com/cross-rs/cross/compare/v0.1.15...v0.1.16 +[v0.1.15]: https://github.com/cross-rs/cross/compare/v0.1.14...v0.1.15 +[v0.1.14]: https://github.com/cross-rs/cross/compare/v0.1.13...v0.1.14 +[v0.1.13]: https://github.com/cross-rs/cross/compare/v0.1.12...v0.1.13 +[v0.1.12]: https://github.com/cross-rs/cross/compare/v0.1.11...v0.1.12 +[v0.1.11]: https://github.com/cross-rs/cross/compare/v0.1.10...v0.1.11 +[v0.1.10]: https://github.com/cross-rs/cross/compare/v0.1.9...v0.1.10 +[v0.1.9]: https://github.com/cross-rs/cross/compare/v0.1.8...v0.1.9 +[v0.1.8]: https://github.com/cross-rs/cross/compare/v0.1.7...v0.1.8 +[v0.1.7]: https://github.com/cross-rs/cross/compare/v0.1.6...v0.1.7 +[v0.1.6]: https://github.com/cross-rs/cross/compare/v0.1.5...v0.1.6 +[v0.1.5]: https://github.com/cross-rs/cross/compare/v0.1.4...v0.1.5 +[v0.1.4]: https://github.com/cross-rs/cross/compare/v0.1.3...v0.1.4 +[v0.1.3]: https://github.com/cross-rs/cross/compare/v0.1.2...v0.1.3 +[v0.1.2]: https://github.com/cross-rs/cross/compare/v0.1.1...v0.1.2 +[v0.1.1]: https://github.com/cross-rs/cross/compare/v0.1.0...v0.1.1 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index edc0c6c68..4a33c879c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -2,8 +2,6 @@ ## Conduct -**Contact**: [Tools team] - * 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. * On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. * Please be kind and courteous. There's no need to be mean or rude. @@ -30,8 +28,11 @@ In the Rust community we strive to go the extra step to look out for each other. 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. -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). +The enforcement policies listed above apply to the cross-rs [GitHub repositories] +and the cross-rs [Matrix room]. *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/).* -[team]: https://github.com/rust-embedded/wg#the-Tools-team +[team]: https://github.com/cross-rs +[GitHub repositories]: https://github.com/cross-rs +[Matrix room]: https://matrix.to/#/#cross-rs:matrix.org diff --git a/Cargo.toml b/Cargo.toml index 8f40c4cd8..e05882ef2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,11 +2,11 @@ authors = ["Jorge Aparicio ", "Markus Reiter "] build = "build.rs" description = "Zero setup cross compilation and cross testing" -documentation = "https://github.com/rust-embedded/cross" +documentation = "https://github.com/cross-rs/cross" keywords = ["cross", "compilation", "testing", "tool"] license = "MIT OR Apache-2.0" name = "cross" -repository = "https://github.com/rust-embedded/cross" +repository = "https://github.com/cross-rs/cross" version = "0.2.1" edition = "2018" diff --git a/README.md b/README.md index b30d822dd..ea54797e3 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,15 @@ [![crates.io](https://img.shields.io/crates/d/cross.svg)](https://crates.io/crates/cross) [![Build Status](https://img.shields.io/azure-devops/build/rust-embedded/c0ce10ee-fd41-4551-b3e3-9612e8ab62f3/2/master)](https://dev.azure.com/rust-embedded/cross/_build?definitionId=2) [![Docker Pulls](https://img.shields.io/docker/pulls/rustembedded/cross)](https://hub.docker.com/r/rustembedded/cross) +[![Matrix](https://img.shields.io/matrix/cross-rs:matrix.org)](https://matrix.to/#/#cross-rs:matrix.org) # `cross` > “Zero setup” cross compilation and “cross testing” of Rust crates -This project is developed and maintained by the [Tools team][team]. +This project is developed and maintained by the [cross-rs] team. +It was previously maintained by the Rust Embedded Working Group Tools team. +New contributors are welcome! Please join our [Matrix room] and say hi.

Date: Mon, 24 Jan 2022 11:24:37 +0000 Subject: [PATCH 2/2] Remove Azure CI requirement from Bors --- .github/CODEOWNERS | 2 +- .github/bors.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b1bf65307..ceab59b18 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @rust-embedded/tools @Dylan-DPC +* @cross-rs/maintainers diff --git a/.github/bors.toml b/.github/bors.toml index 5b4469724..79d3b7f58 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -1,5 +1,5 @@ block_labels = ["needs-decision"] delete_merged_branches = true required_approvals = 1 -status = ["rust-embedded.cross", "shellcheck"] +status = ["shellcheck"] timeout_sec = 21600