From 7ca53fb5320b639dbcfd75ada667ffde488fe219 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Thu, 12 Mar 2020 23:39:59 +0100
Subject: [PATCH 1/2] CI: troubleshoot macOS build (#356)
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index bea20cf75..f52e084c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,12 @@ matrix:
script:
- cargo check --all --benches
- os: osx
- osx_image: xcode11.2
+ osx_image: xcode11.3
addons:
chrome: stable
firefox: latest
install:
- - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | sh
+ - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | sh
- source ~/.nvm/nvm.sh
- nvm install --lts
- npm install -g chromedriver
From 2f3167d10e8b55e1555ac73a467d2a1eb0d0fc02 Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Fri, 13 Mar 2020 00:02:27 +0100
Subject: [PATCH 2/2] parity-util-mem: use malloc for usable_size on android
(#355)
---
parity-util-mem/src/allocators.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parity-util-mem/src/allocators.rs b/parity-util-mem/src/allocators.rs
index e159a32d0..45df9cba2 100644
--- a/parity-util-mem/src/allocators.rs
+++ b/parity-util-mem/src/allocators.rs
@@ -96,7 +96,7 @@ mod usable_size {
mimalloc_sys::mi_usable_size(ptr as *mut _)
}
- } else if #[cfg(target_os = "linux")] {
+ } else if #[cfg(any(target_os = "linux", target_os = "android"))] {
/// Linux call system allocator (currently malloc).
extern "C" {