From e8c192606ee6acf562427d828a944cd281dd612d Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Wed, 1 Apr 2020 20:41:02 +0100 Subject: [PATCH] Update cbindgen to fix build error cargo install no longer needs --force to upgrade to a newer version or if the desired version is already installed. This relies on a couple of extra files to cache, otherwise cargo doesn't recognise the cached cbindgen exe. --- .travis.yml | 2 +- appveyor.yml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1ff6cde..c4d99bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: # Add sphinx-build to PATH - export PATH="$HOME/.local/bin:$PATH" # Install cbindgen for generating C++ headers for Rust dependencies. - - wget -P "$HOME/.local/bin" https://github.com/eqrion/cbindgen/releases/download/v0.9.1/cbindgen + - wget -P "$HOME/.local/bin" https://github.com/eqrion/cbindgen/releases/download/v0.13.2/cbindgen - chmod +x "$HOME/.local/bin/cbindgen" before_script: diff --git a/appveyor.yml b/appveyor.yml index fcd083e0..174dc31d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,15 +20,14 @@ environment: cache: - C:\Users\appveyor\.cargo\bin\cbindgen.exe + - C:\Users\appveyor\.cargo\.crates.toml + - C:\Users\appveyor\.cargo\.crates2.json install: - curl -sSf -o rustup-init.exe https://win.rustup.rs/x86_64 - rustup-init.exe -y - rustup target add i686-pc-windows-msvc - - ps: | - $version = cbindgen --version - if (!([string]$version).endswith('0.9.0')) { $env:INSTALL_CBINDGEN=1 } - - IF "%INSTALL_CBINDGEN%" == "1" cargo install cbindgen --version 0.9.0 --force + - cargo install cbindgen --version 0.13.2 - nuget install doxygen -Version 1.8.14 - py -3.7 -m pip install -r docs/requirements.txt - ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/Ortham/ci-scripts/2.1.3/delete_old_bintray_versions.py', "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py")