diff --git a/CHANGELOG.md b/CHANGELOG.md index 9608085c7..8006fe20f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [v0.2.1] - 2020-06-30 + +- Disabled `powerpc64-unknown-linux-gnu` image. +- Disabled `sparc64-unknown-linux-gnu` image. - Disabled `x86_64-unknown-dragonfly` image. - Removed CI testing for `i686-apple-darwin`. @@ -224,7 +228,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Initial release. Supports 12 targets. -[Unreleased]: https://github.com/rust-embedded/cross/compare/v0.2.0...HEAD +[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 diff --git a/Cargo.lock b/Cargo.lock index 29f63d8a2..cc528539f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,33 +1,39 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "atty" -version = "0.2.14" +name = "addr2line" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hermit-abi 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gimli 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "backtrace" -version = "0.3.44" +name = "adler32" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "atty" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "backtrace-sys" -version = "0.1.32" +name = "backtrace" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", + "addr2line 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -37,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -47,21 +53,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cross" -version = "0.2.0" +version = "0.2.1" dependencies = [ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", - "shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", + "shell-escape 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "which 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -69,16 +75,21 @@ name = "error-chain" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.44 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.49 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gimli" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "hermit-abi" -version = "0.1.7" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -86,12 +97,12 @@ name = "home" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "itoa" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -101,21 +112,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.67" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "miniz_oxide" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "nix" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "object" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "rustc-demangle" version = "0.1.16" @@ -131,7 +155,7 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -149,22 +173,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.104" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_json" -version = "1.0.48" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "shell-escape" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -172,12 +196,12 @@ name = "toml" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "version_check" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -187,15 +211,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "which" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -213,31 +237,35 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] +"checksum addr2line 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" +"checksum adler32 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -"checksum backtrace 0.3.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536" -"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +"checksum backtrace 0.3.49 (registry+https://github.com/rust-lang/crates.io-index)" = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" +"checksum cc 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "77c1f1d60091c1b73e2b1f4560ab419204b178e625fa945ded7b660becd2bd46" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" -"checksum hermit-abi 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e2c55f143919fbc0bc77e427fe2d74cf23786d7c1875666f2fde3ac3c659bb67" +"checksum gimli 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" +"checksum hermit-abi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" "checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +"checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" +"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" +"checksum miniz_oxide 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" "checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" +"checksum object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" +"checksum ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" -"checksum shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9" +"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +"checksum serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +"checksum shell-escape 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" +"checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5475d47078209a02e60614f7ba5e645ef3ed60f771920ac1906d7c1cc65024c8" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum which 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/Cargo.toml b/Cargo.toml index 7de9b652f..072d0a6c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["cross", "compilation", "testing", "tool"] license = "MIT OR Apache-2.0" name = "cross" repository = "https://github.com/rust-embedded/cross" -version = "0.2.0" +version = "0.2.1" edition = "2018" [dependencies] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0cffdfe09..863d08497 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,11 +30,11 @@ jobs: mips64-unknown-linux-gnuabi64: { TARGET: mips64-unknown-linux-gnuabi64, CPP: 1, DYLIB: 1, STD: 1, RUN: 1 } mips64el-unknown-linux-gnuabi64: { TARGET: mips64el-unknown-linux-gnuabi64, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system } powerpc-unknown-linux-gnu: { TARGET: powerpc-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system } - powerpc64-unknown-linux-gnu: { TARGET: powerpc64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system } + # powerpc64-unknown-linux-gnu: { TARGET: powerpc64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system } powerpc64le-unknown-linux-gnu: { TARGET: powerpc64le-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system } riscv64gc-unknown-linux-gnu: { TARGET: riscv64gc-unknown-linux-gnu, CPP: 1, STD: 1, RUN: 1 } s390x-unknown-linux-gnu: { TARGET: s390x-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system } - sparc64-unknown-linux-gnu: { TARGET: sparc64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system } + # sparc64-unknown-linux-gnu: { TARGET: sparc64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system } x86_64-unknown-linux-gnu: { TARGET: x86_64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: native qemu-user qemu-system, DEPLOY: 1, CRATES_IO_PUBLISH: 1 } aarch64-unknown-linux-musl: { TARGET: aarch64-unknown-linux-musl, STD: 1, RUN: 1 } arm-unknown-linux-musleabihf: { TARGET: arm-unknown-linux-musleabihf, STD: 1, RUN: 1 } @@ -81,7 +81,7 @@ jobs: - bash: echo "##vso[task.setvariable variable=TAG]${BUILD_SOURCEBRANCH##refs/tags/}" displayName: Set TAG Variable condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') - - bash: cargo test + - bash: cargo test displayName: Run unit tests timeoutInMinutes: 5 - bash: ./build-docker-image.sh "${TARGET}" diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index 4a9619860..ad9dbc6e8 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -13,7 +13,9 @@ steps: rustup self update fi else - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain="$TOOLCHAIN" --profile=minimal + curl --retry 3 -sSfL https://sh.rustup.rs -o rustup-init.sh + sh rustup-init.sh -y --default-toolchain="$TOOLCHAIN" --profile=minimal + rm rustup-init.sh echo "##vso[task.prependpath]$HOME/.cargo/bin" fi displayName: Install rustup diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf index 65b6d71ad..6aa7f2aeb 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabihf +++ b/docker/Dockerfile.arm-unknown-linux-gnueabihf @@ -9,10 +9,12 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN mkdir /usr/arm-linux-gnueabihf && \ - cd /usr/arm-linux-gnueabihf && \ - curl -L https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz | \ - tar --strip-components 1 -xJ +RUN mkdir /usr/arm-linux-gnueabihf \ + && cd /usr/arm-linux-gnueabihf \ + && export TOOLCHAIN_VERSION=8.3-2019.03 \ + && curl --retry 3 -sSfL https://developer.arm.com/-/media/Files/downloads/gnu-a/${TOOLCHAIN_VERSION}/binrel/gcc-arm-${TOOLCHAIN_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz -O \ + && tar --strip-components 1 -xJf gcc-arm-${TOOLCHAIN_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz \ + && rm gcc-arm-${TOOLCHAIN_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH diff --git a/docker/android-ndk.sh b/docker/android-ndk.sh index 9d8a2f07d..c5668ff3d 100755 --- a/docker/android-ndk.sh +++ b/docker/android-ndk.sh @@ -28,7 +28,7 @@ main() { td="$(mktemp -d)" pushd "${td}" - curl -O "${NDK_URL}" + curl --retry 3 -sSfL "${NDK_URL}" -O unzip -q android-ndk-*.zip pushd android-ndk-* ./build/tools/make_standalone_toolchain.py \ diff --git a/docker/android-system.sh b/docker/android-system.sh index 78cb7f242..1a0eca10b 100755 --- a/docker/android-system.sh +++ b/docker/android-system.sh @@ -50,7 +50,7 @@ EOF fi done - curl -O https://storage.googleapis.com/git-repo-downloads/repo + curl --retry 3 -sSfL https://storage.googleapis.com/git-repo-downloads/repo -O chmod +x repo # this is the minimum set of modules that are need to build bionic diff --git a/docker/cmake.sh b/docker/cmake.sh index cd40f5c47..d16a41e44 100755 --- a/docker/cmake.sh +++ b/docker/cmake.sh @@ -22,7 +22,7 @@ main() { pushd "${td}" - curl -sSfL "https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-Linux-x86_64.sh" -o cmake.sh + curl --retry 3 -sSfL "https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-Linux-x86_64.sh" -o cmake.sh sh cmake.sh --skip-license --prefix=/usr/local popd diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/disabled/Dockerfile.powerpc64-unknown-linux-gnu similarity index 100% rename from docker/Dockerfile.powerpc64-unknown-linux-gnu rename to docker/disabled/Dockerfile.powerpc64-unknown-linux-gnu diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/disabled/Dockerfile.sparc64-unknown-linux-gnu similarity index 100% rename from docker/Dockerfile.sparc64-unknown-linux-gnu rename to docker/disabled/Dockerfile.sparc64-unknown-linux-gnu diff --git a/docker/disabled/dragonfly.sh b/docker/disabled/dragonfly.sh index e8e9f477a..43b64d670 100755 --- a/docker/disabled/dragonfly.sh +++ b/docker/disabled/dragonfly.sh @@ -35,11 +35,11 @@ main() { mkdir "${td}"/{binutils,gcc}{,-build} "${td}/dragonfly" - curl "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" | \ - tar -C "${td}/binutils" --strip-components=1 -xj + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" -O + tar -C "${td}/binutils" --strip-components=1 -xjf "binutils-${binutils}.tar.bz2" - curl "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" | \ - tar -C "${td}/gcc" --strip-components=1 -xj + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" -O + tar -C "${td}/gcc" --strip-components=1 -xjf "gcc-${gcc}.tar.bz2" pushd "${td}" @@ -90,9 +90,8 @@ EOF EOF cd .. - curl "https://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-${dragonfly}.iso.bz2" | \ - bzcat | \ - bsdtar xf - -C "${td}/dragonfly" ./usr/include ./usr/lib ./lib + curl --retry 3 -sSfL "https://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-${dragonfly}.iso.bz2" -O + bzcat "dfly-x86_64-${dragonfly}.iso.bz2" | bsdtar xf - -C "${td}/dragonfly" ./usr/include ./usr/lib ./lib cd binutils-build ../binutils/configure \ diff --git a/docker/dropbear.sh b/docker/dropbear.sh index dd6b2f285..0c9fffc4d 100755 --- a/docker/dropbear.sh +++ b/docker/dropbear.sh @@ -4,7 +4,7 @@ set -x set -euo pipefail main() { - local version=2019.78 + local version=2020.80 local dependencies=( autoconf @@ -29,8 +29,8 @@ main() { pushd "${td}" - curl -L "https://matt.ucc.asn.au/dropbear/dropbear-${version}.tar.bz2" | \ - tar --strip-components=1 -xj + curl --retry 3 -sSfL "https://matt.ucc.asn.au/dropbear/dropbear-${version}.tar.bz2" -O + tar --strip-components=1 -xjf "dropbear-${version}.tar.bz2" # Remove some unwanted message sed -i '/skipping hostkey/d' cli-kex.c diff --git a/docker/freebsd.sh b/docker/freebsd.sh index 83a6af69e..b1ab3a5bc 100755 --- a/docker/freebsd.sh +++ b/docker/freebsd.sh @@ -34,11 +34,11 @@ main() { mkdir "${td}"/{binutils,gcc}{,-build} "${td}/freebsd" - curl "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" | \ - tar -C "${td}/binutils" --strip-components=1 -xj + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" -O + tar -C "${td}/binutils" --strip-components=1 -xjf "binutils-${binutils}.tar.bz2" - curl "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" | \ - tar -C "${td}/gcc" --strip-components=1 -xj + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" -O + tar -C "${td}/gcc" --strip-components=1 -xjf "gcc-${gcc}.tar.bz2" pushd "${td}" @@ -57,8 +57,8 @@ main() { ;; esac - curl "http://ftp.freebsd.org/pub/FreeBSD/releases/${bsd_arch}/10.2-RELEASE/base.txz" | \ - tar -C "${td}/freebsd" -xJ ./usr/include ./usr/lib ./lib + curl --retry 3 -sSfL "http://ftp.freebsd.org/pub/FreeBSD/releases/${bsd_arch}/10.2-RELEASE/base.txz" -O + tar -C "${td}/freebsd" -xJf base.txz ./usr/include ./usr/lib ./lib cd binutils-build ../binutils/configure \ diff --git a/docker/musl.sh b/docker/musl.sh index 87f6ac42b..28ad2164d 100755 --- a/docker/musl.sh +++ b/docker/musl.sh @@ -19,6 +19,8 @@ hide_output() { } main() { + local version=0.9.8 + local dependencies=( ca-certificates curl @@ -38,13 +40,13 @@ main() { td="$(mktemp -d)" pushd "${td}" - curl -L https://github.com/richfelker/musl-cross-make/archive/v0.9.8.tar.gz | \ - tar --strip-components=1 -xz + curl --retry 3 -sSfL "https://github.com/richfelker/musl-cross-make/archive/v${version}.tar.gz" -O + tar --strip-components=1 -xzf "v${version}.tar.gz" hide_output make install "-j$(nproc)" \ GCC_VER=6.4.0 \ MUSL_VER=1.1.22 \ - DL_CMD='curl -C - -L -o' \ + DL_CMD='curl --retry 3 -sSfL -C - -o' \ OUTPUT=/usr/local/ \ "${@}" diff --git a/docker/netbsd.sh b/docker/netbsd.sh index e34e07862..6447c702c 100755 --- a/docker/netbsd.sh +++ b/docker/netbsd.sh @@ -33,11 +33,11 @@ main() { mkdir "${td}"/{binutils,gcc}{,-build} "${td}/netbsd" - curl "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" | \ - tar -C "${td}/binutils" --strip-components=1 -xj + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.bz2" -O + tar -C "${td}/binutils" --strip-components=1 -xjf "binutils-${binutils}.tar.bz2" - curl "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" | \ - tar -C "${td}/gcc" --strip-components=1 -xj + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.bz2" -O + tar -C "${td}/gcc" --strip-components=1 -xjf "gcc-${gcc}.tar.bz2" pushd "${td}" @@ -51,16 +51,19 @@ main() { local patch for patch in "${patches[@]}"; do - patch="$(curl "${patch}")" - echo "${patch}" | patch -Np0 + local patch_file + patch_file="$(mktemp)" + curl --retry 3 -sSfL "${patch}" -o "${patch_file}" + patch -Np0 < "${patch_file}" + rm "${patch_file}" done cd .. - curl ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/binary/sets/base.tgz | \ - tar -C "${td}/netbsd" -xz ./usr/include ./usr/lib ./lib + curl --retry 3 -sSfL ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/binary/sets/base.tgz -O + tar -C "${td}/netbsd" -xzf base.tgz ./usr/include ./usr/lib ./lib - curl ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/binary/sets/comp.tgz | \ - tar -C "${td}/netbsd" -xz ./usr/include ./usr/lib + curl --retry 3 -sSfL ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/binary/sets/comp.tgz -O + tar -C "${td}/netbsd" -xzf comp.tgz ./usr/include ./usr/lib cd binutils-build ../binutils/configure \ diff --git a/docker/qemu.sh b/docker/qemu.sh index 310b15d32..747fcaa55 100755 --- a/docker/qemu.sh +++ b/docker/qemu.sh @@ -53,8 +53,8 @@ main() { pushd "${td}" - curl -L "https://download.qemu.org/qemu-${version}.tar.xz" | \ - tar --strip-components=1 -xJ + curl --retry 3 -sSfL "https://download.qemu.org/qemu-${version}.tar.xz" -O + tar --strip-components=1 -xJf "qemu-${version}.tar.xz" local targets="${arch}-linux-user" local virtfs="" diff --git a/docker/solaris.sh b/docker/solaris.sh index fad0c0101..126867f60 100755 --- a/docker/solaris.sh +++ b/docker/solaris.sh @@ -36,11 +36,11 @@ main() { mkdir "${td}"/{binutils,gcc}{,-build} "${td}/solaris" - curl "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.xz" | \ - tar -C "${td}/binutils" --strip-components=1 -xJ + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/binutils/binutils-${binutils}.tar.xz" -O + tar -C "${td}/binutils" --strip-components=1 -xJf "binutils-${binutils}.tar.xz" - curl "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.xz" | \ - tar -C "${td}/gcc" --strip-components=1 -xJ + curl --retry 3 -sSfL "https://ftp.gnu.org/gnu/gcc/gcc-${gcc}/gcc-${gcc}.tar.xz" -O + tar -C "${td}/gcc" --strip-components=1 -xJf "gcc-${gcc}.tar.xz" pushd "${td}" diff --git a/docker/xargo.sh b/docker/xargo.sh index 0ea69d00c..c349d96d8 100755 --- a/docker/xargo.sh +++ b/docker/xargo.sh @@ -21,7 +21,7 @@ main() { export RUSTUP_HOME=/tmp/rustup export CARGO_HOME=/tmp/cargo - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh + curl --retry 3 -sSfL https://sh.rustup.rs -o rustup-init.sh sh rustup-init.sh -y --no-modify-path --profile minimal rm rustup-init.sh