aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorGravatar Douman <douman@gmx.se> 2019-08-27 22:09:43 +0200
committerGravatar Carl Lerche <me@carllerche.com> 2019-08-27 13:09:43 -0700
commitb6cb346adfaae89bce44bfa337652e6d218d38c4 (patch)
tree0e6cb36b1db4ece480554bce0f2f0ab307013931 /ci
parent79e4b2847f27137faaf149d116a352cbeae47fd1 (diff)
downloadbytes-b6cb346adfaae89bce44bfa337652e6d218d38c4.tar.gz
bytes-b6cb346adfaae89bce44bfa337652e6d218d38c4.tar.zst
bytes-b6cb346adfaae89bce44bfa337652e6d218d38c4.zip
Remove IntoBuf/FromBuf (#288)
As consequence Buf::collect is removed as well, which is replaced with `Buf::into_bytes`. The advantage of `Buf::into_bytes` is that it can be optimized in cases where converting a `T: Buf` into a `Bytes` instance is efficient.
Diffstat (limited to 'ci')
-rw-r--r--ci/azure-cross-compile.yml1
-rw-r--r--ci/cross-patch8
2 files changed, 5 insertions, 4 deletions
diff --git a/ci/azure-cross-compile.yml b/ci/azure-cross-compile.yml
index cdcc197..62840f5 100644
--- a/ci/azure-cross-compile.yml
+++ b/ci/azure-cross-compile.yml
@@ -37,6 +37,7 @@ jobs:
- 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
diff --git a/ci/cross-patch b/ci/cross-patch
index f59b551..b1fb4ba 100644
--- a/ci/cross-patch
+++ b/ci/cross-patch
@@ -1,5 +1,5 @@
-diff --git a/src/docker.rs b/src/docker.rs
-index 1525b87..5c9cd54 100644
+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<()> {
@@ -12,8 +12,8 @@ index 1525b87..5c9cd54 100644
.args(&["sh", "-c", cmd])
.run(verbose)
@@ -160,7 +160,7 @@ pub fn run(target: &Target,
- .args(&["-v", &format!("{}:/rust:ro", sysroot.display())])
- .args(&["-v", &format!("{}:/target", target_dir.display())])
+ .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)?])