Skip to content

Commit

Permalink
Merge cross-rs#631
Browse files Browse the repository at this point in the history
631: Update URLs to reference new cross-rs organisation r=Emilgardis a=adamgreig



Co-authored-by: Adam Greig <[email protected]>
  • Loading branch information
bors[bot] and adamgreig authored Jan 24, 2022
2 parents 2f1ef07 + e41de31 commit 4b20973
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @rust-embedded/tools @Dylan-DPC
* @cross-rs/maintainers
2 changes: 1 addition & 1 deletion .github/bors.toml
Original file line number Diff line number Diff line change
@@ -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
38 changes: 19 additions & 19 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 5 additions & 4 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
authors = ["Jorge Aparicio <[email protected]>", "Markus Reiter <[email protected]>"]
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"

Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<p align="center">
<img
Expand Down Expand Up @@ -312,7 +315,7 @@ terminate.
[2] Only works with native tests, that is, tests that do not depends on the
Android Runtime. For i686 some tests may fails with the error `assertion
failed: signal(libc::SIGPIPE, libc::SIG_IGN) != libc::SIG_ERR`, see
[issue #140](https://github.com/rust-embedded/cross/issues/140) for more
[issue #140](https://github.com/cross-rs/cross/issues/140) for more
information.

[4] For *BSD and Solaris targets, the libc column indicates the OS release version
Expand Down Expand Up @@ -379,10 +382,11 @@ dual licensed as above, without any additional terms or conditions.
## Code of Conduct

Contribution to this crate is organized under the terms of the [Rust Code of
Conduct][CoC], the maintainer of this crate, the [Tools team][team], promises
Conduct][CoC], the maintainer of this crate, the [cross-rs] team, promises
to intervene to uphold that code of conduct.

[CoC]: CODE_OF_CONDUCT.md
[team]: https://github.com/rust-embedded/wg#the-tools-team
[cross-rs]: https://github.com/cross-rs
[Docker]: https://www.docker.com
[Podman]: https://podman.io
[Matrix room]: https://matrix.to/#/#cross-rs:matrix.org

0 comments on commit 4b20973

Please sign in to comment.