From 4ae43315aac9caaab107e58394bf6d0bd6ea80a5 Mon Sep 17 00:00:00 2001 From: Yves Zoundi Date: Sat, 9 Jul 2022 02:34:19 -0400 Subject: [PATCH] Remove debug drawing, ci/cd error handling --- ci_cd/macos/build.sh | 2 +- entrusted_client/src/main_gui.rs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ci_cd/macos/build.sh b/ci_cd/macos/build.sh index 6cf196b..83763c8 100755 --- a/ci_cd/macos/build.sh +++ b/ci_cd/macos/build.sh @@ -21,7 +21,7 @@ podman run --rm \ --volume "${PROJECTDIR}":/root/src \ --workdir /root/src \ docker.io/joseluisq/rust-linux-darwin-builder:1.60.0 \ - sh -c "export CC=/usr/local/osxcross/target/bin/o64-clang; export CXX=/usr/local/osxcross/target/bin/o64-clang++; cd /root/src/entrusted_client && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-apple-darwin; cd /root/src/entrusted_webclient && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-apple-darwin; cd /root/src/entrusted_webserver && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-apple-darwin" + sh -c "export CC=/usr/local/osxcross/target/bin/o64-clang; export CXX=/usr/local/osxcross/target/bin/o64-clang++; cd /root/src/entrusted_client && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-apple-darwin && cd /root/src/entrusted_webclient && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-apple-darwin && cd /root/src/entrusted_webserver && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-apple-darwin" retVal=$? if [ $retVal -ne 0 ]; then echo "Failure" diff --git a/entrusted_client/src/main_gui.rs b/entrusted_client/src/main_gui.rs index 36bca23..756681e 100644 --- a/entrusted_client/src/main_gui.rs +++ b/entrusted_client/src/main_gui.rs @@ -800,11 +800,6 @@ fn main() -> Result<(), Box> { .center_screen() .with_label(&wind_title); - wind.draw({ - move |wid| { - draw::draw_rect_fill(wid.x() + wid.w() - WIDGET_GAP, wid.y(), WIDGET_GAP, WIDGET_GAP, enums::Color::Red); - } - }); wind.set_xclass("entrusted"); if let Ok(frame_icon) = image::PngImage::from_data(ICON_FRAME) {