Merge #393 #394

393: Update CMake to 3.16.5. r=adamgreig a=reitermarkus 394: Fix CI for `i686-apple-darwin`. r=adamgreig a=reitermarkus Co-authored-by: Markus Reiter <[email protected]>
cross-rs · Mar 12, 2020 · 69de92b · 69de92b
3 parents 2aa8990 + 1bf2203 + 659d17a
commit 69de92b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -50,7 +50,7 @@ jobs:
         armv7-linux-androideabi:         { TARGET: armv7-linux-androideabi,         CPP: 1,           STD: 1, RUN: 1 }
         i686-linux-android:              { TARGET: i686-linux-android,              CPP: 1,           STD: 1, RUN: 1 }
         x86_64-linux-android:            { TARGET: x86_64-linux-android,            CPP: 1,           STD: 1, RUN: 1 }
-        i686-apple-darwin:               { TARGET: i686-apple-darwin,               CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-10.13 }
+        i686-apple-darwin:               { TARGET: i686-apple-darwin,               CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-10.14 }
         x86_64-apple-darwin:             { TARGET: x86_64-apple-darwin,             CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-latest, DEPLOY: 1 }
         x86_64-pc-windows-gnu:           { TARGET: x86_64-pc-windows-gnu,           CPP: 1,           STD: 1,                   RUN: 1 }
         # `cargo build` fails with undefined symbols (https://github.com/rust-lang/rust/issues/32859) on `i686-pc-windows-gnu`.

diff --git a/docker/cmake.sh b/docker/cmake.sh
@@ -4,7 +4,7 @@ set -x
 set -euo pipefail
 
 main() {
-    local version=3.16.4
+    local version=3.16.5
 
     local dependencies=(
         curl