From 486499e82f546f8e03d4191672fa5cc8c034fdf7 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Thu, 20 Feb 2020 19:30:30 +0100 Subject: [PATCH 1/3] Avoid pulling if image already exists locally. --- build-docker-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-image.sh b/build-docker-image.sh index 9f278b2c2..2d1a95b69 100755 --- a/build-docker-image.sh +++ b/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 From 1bf2203d08497ff6536edcd91ed2b9eec700e826 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Thu, 12 Mar 2020 05:14:23 +0100 Subject: [PATCH 2/3] Update CMake to 3.16.5. --- docker/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/cmake.sh b/docker/cmake.sh index 242693842..83df5a19e 100755 --- 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 From 659d17a3363215314c2f57abad5caed3b7172e01 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Thu, 12 Mar 2020 05:17:01 +0100 Subject: [PATCH 3/3] Fix CI for `i686-apple-darwin`. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cff827483..142b8abd1 100644 --- 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`.