mirror of
https://github.com/openharmony/third_party_rust_bytes.git
synced 2026-07-19 17:05:29 -04:00
Remove a patch for cross
This commit is contained in:
@@ -30,17 +30,7 @@ jobs:
|
||||
parameters:
|
||||
rust_version: ${{parameters.rust_version}}
|
||||
|
||||
# FIXME(taiki-e): When https://github.com/rust-embedded/cross/pull/169 is
|
||||
# merged, switch to the installation from crates.io.
|
||||
# See https://nbsoftsolutions.com/blog/azure-pipelines-for-rust-projects#workaround-cross-compilation
|
||||
# for the current script.
|
||||
- script: |
|
||||
git clone https://github.com/rust-embedded/cross.git
|
||||
cd cross
|
||||
git reset --hard fb1cb1d7288151f4349f1cb4c990e0e2281764da #Is broken after this commit (images are not uploaded to new docker hub)
|
||||
git apply ../ci/cross-patch
|
||||
cargo install --path .
|
||||
rm -rf cross
|
||||
- script: cargo install cross
|
||||
displayName: Install cross
|
||||
condition: not(eq(variables['target'], 'wasm32-unknown-unknown'))
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/src/docker.rs b/src/docker.rs
|
||||
index 6ea745d..15fef81 100644
|
||||
--- a/src/docker.rs
|
||||
+++ b/src/docker.rs
|
||||
@@ -62,7 +62,7 @@ pub fn register(target: &Target, verbose: bool) -> Result<()> {
|
||||
docker_command("run")
|
||||
.arg("--privileged")
|
||||
.arg("--rm")
|
||||
- .arg("-it")
|
||||
+ .arg("-i")
|
||||
.arg("ubuntu:16.04")
|
||||
.args(&["sh", "-c", cmd])
|
||||
.run(verbose)
|
||||
@@ -160,7 +160,7 @@ pub fn run(target: &Target,
|
||||
.args(&["-v", &format!("{}:/rust:Z,ro", sysroot.display())])
|
||||
.args(&["-v", &format!("{}:/target:Z", target_dir.display())])
|
||||
.args(&["-w", "/project"])
|
||||
- .args(&["-it", &image(toml, target)?])
|
||||
+ .args(&["-i", &image(toml, target)?])
|
||||
.args(&["sh", "-c", &format!("PATH=$PATH:/rust/bin {:?}", cmd)])
|
||||
.run_and_get_status(verbose)
|
||||
}
|
||||
Reference in New Issue
Block a user