diff --git a/CHANGELOG.md b/CHANGELOG.md index 27c7519fa..07eb04062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] - ReleaseDate +## [v0.2.3] - 2022-07-08 + ### Added - #921 - use `CARGO_TERM_VERBOSE`, `CARGO_TERM_QUIET`, and `CARGO_TERM_COLOR` environment variables for cross terminal output. @@ -355,7 +357,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). -[Unreleased]: https://github.com/cross-rs/cross/compare/v0.2.2...HEAD +[Unreleased]: https://github.com/cross-rs/cross/compare/v0.2.3...HEAD + +[v0.2.3]: https://github.com/cross-rs/cross/compare/v0.2.2...v0.2.3 [v0.2.2]: https://github.com/cross-rs/cross/compare/v0.2.1...v0.2.2 [v0.2.1]: https://github.com/cross-rs/cross/compare/v0.2.0...v0.2.1 diff --git a/Cargo.lock b/Cargo.lock index e2e058a5c..55d993317 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,7 +150,7 @@ checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" [[package]] name = "cross" -version = "0.2.2" +version = "0.2.3" dependencies = [ "atty", "clap", diff --git a/Cargo.toml b/Cargo.toml index 53492a4aa..a7918d6f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ keywords = ["cross", "compilation", "testing", "tool"] license = "MIT OR Apache-2.0" name = "cross" repository = "https://github.com/cross-rs/cross" -version = "0.2.2" +version = "0.2.3" edition = "2021" include = [ "src/**/*", diff --git a/ci/test-cross-image.sh b/ci/test-cross-image.sh index a591ba684..9fb57f51b 100755 --- a/ci/test-cross-image.sh +++ b/ci/test-cross-image.sh @@ -7,10 +7,13 @@ set -eo pipefail if [[ -z "${TARGET}" ]]; then export TARGET="aarch64-unknown-linux-gnu" fi +# ^^subst is not supported on macOS bash (bash <4) +# shellcheck disable=SC2155 +export TARGET_UPPER=$(echo "$TARGET" | awk '{print toupper($0)}') if [[ "${IMAGE}" ]]; then # shellcheck disable=SC2140 - export "CROSS_TARGET_${TARGET//-/_}_IMAGE"="${IMAGE}" + export "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE"="${IMAGE}" fi if [[ -z "${CROSS_TARGET_CROSS_IMAGE}" ]]; then @@ -20,7 +23,7 @@ fi main() { - docker run --rm -e TARGET -e "CROSS_TARGET_${TARGET//-/_}_IMAGE" \ + docker run --rm -e TARGET -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \ -v /var/run/docker.sock:/var/run/docker.sock \ "${CROSS_TARGET_CROSS_IMAGE}" sh -c ' #!/usr/bin/env sh diff --git a/ci/test-docker-in-docker.sh b/ci/test-docker-in-docker.sh index c9a33c021..f7705c068 100755 --- a/ci/test-docker-in-docker.sh +++ b/ci/test-docker-in-docker.sh @@ -9,10 +9,13 @@ set -eo pipefail if [[ -z "${TARGET}" ]]; then export TARGET="aarch64-unknown-linux-gnu" fi +# ^^subst is not supported on macOS bash (bash <4) +# shellcheck disable=SC2155 +export TARGET_UPPER=$(echo "$TARGET" | awk '{print toupper($0)}') if [[ "${IMAGE}" ]]; then # shellcheck disable=SC2140 - export "CROSS_TARGET_${TARGET//-/_}_IMAGE"="${IMAGE}" + export "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE"="${IMAGE}" fi source=$(dirname "${BASH_SOURCE[0]}") @@ -23,7 +26,7 @@ main() { docker run -v "${home}":"${home}" -w "${home}" \ --rm -e TARGET -e RUSTFLAGS -e RUST_TEST_THREADS \ -e LLVM_PROFILE_FILE -e CARGO_INCREMENTAL \ - -e "CROSS_TARGET_${TARGET//-/_}_IMAGE" \ + -e "CROSS_TARGET_${TARGET_UPPER//-/_}_IMAGE" \ -v /var/run/docker.sock:/var/run/docker.sock \ docker:18.09-dind sh -c ' #!/usr/bin/env sh