From f1cb68f99b9ed36c8fc297dec5a9488d8ff407a0 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 22 Oct 2019 10:03:37 -0700 Subject: [PATCH] Fix macOS cli bug --- cli/mkrelease.sh | 9 +++++---- docker/Dockerfile | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cli/mkrelease.sh b/cli/mkrelease.sh index a01801b..29226c5 100755 --- a/cli/mkrelease.sh +++ b/cli/mkrelease.sh @@ -31,14 +31,15 @@ cargo clean # Compile for mac directly cargo build --release +# macOS +rm -rf target/macOS-zecpaperwallet-v$APP_VERSION +mkdir -p target/macOS-zecpaperwallet-v$APP_VERSION +cp target/release/zecpaperwallet target/macOS-zecpaperwallet-v$APP_VERSION/ + # For Windows and Linux, build via docker docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rustbuild:latest bash -c "cd /opt/zecpaperwallet/cli && cargo build --release && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu" # Now sign and zip the binaries -#macOS -rm -rf target/macOS-zecpaperwallet-v$APP_VERSION -mkdir -p target/macOS-zecpaperwallet-v$APP_VERSION -cp target/release/zecpaperwallet target/macOS-zecpaperwallet-v$APP_VERSION/ gpg --batch --output target/macOS-zecpaperwallet-v$APP_VERSION/zecpaperwallet.sig --detach-sig target/macOS-zecpaperwallet-v$APP_VERSION/zecpaperwallet cd target cd macOS-zecpaperwallet-v$APP_VERSION diff --git a/docker/Dockerfile b/docker/Dockerfile index 03e0b1f..a0c7f8c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,10 @@ -FROM rust:1.34 +FROM rust:1.37 LABEL Description="Rust compile env for Linux + Windows (cross)" RUN apt update RUN apt install -y build-essential mingw-w64 gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf RUN rustup target add x86_64-pc-windows-gnu -RUN rustup target add x86_64-unknown-linux-musl RUN rustup target add aarch64-unknown-linux-gnu RUN rustup target add armv7-unknown-linux-gnueabihf @@ -19,6 +18,5 @@ RUN echo "[target.aarch64-unknown-linux-gnu]" >> /usr/local/cargo/config && \ RUN echo "[target.armv7-unknown-linux-gnueabihf]" >> /usr/local/cargo/config && \ echo "linker = '/usr/bin/arm-linux-gnueabihf-gcc-5'" >> /usr/local/cargo/config -ENV CC_x86_64_unknown_linux_musl="gcc" ENV CC_aarch64_unknown_linux_gnu="aarch64-linux-gnu-gcc" ENV CC_armv7_unknown_linux_gnueabhihf="arm-linux-gnueabihf-gcc-5"