Merge #377 #393 #394

377: Avoid pulling if image already exists locally. r=adamgreig a=reitermarkus

This avoids overwriting the local image when making changes to images locally.

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 <me@reitermark.us>

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`.

build-docker-image.sh

@@ -10,7 +10,7 @@ run() {
   local image_name="rustembedded/cross:${1}"
   local cache_from_args=
 
-  if docker pull "${image_name}"; then
+  if docker image inspect "${image_name}" &>/dev/null || docker pull "${image_name}"; then
     cache_from_args=(--cache-from "${image_name}")
   fi
 

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