From 3c4b89a8daf2dedf1cde99aabd11d6eb978e4acf Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Wed, 18 Dec 2024 22:49:13 -0500 Subject: [PATCH] Remove broken MSI, clean up windows build --- .gitattributes | 1 + scripts/do-release.sh | 4 ---- scripts/release.sh | 2 +- src/main.rs | 3 +++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 061d577..cdbbaad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ *.html text eol=lf diff=html *.java text eol=lf diff=java *.js text eol=lf diff=js +*.sh text eol=lf *.txt text eol=lf *.class binary diff --git a/scripts/do-release.sh b/scripts/do-release.sh index 02f5121..2b749e6 100755 --- a/scripts/do-release.sh +++ b/scripts/do-release.sh @@ -15,10 +15,6 @@ cp target/release/bundle/deb/*.deb output cargo build --release --target x86_64-pc-windows-msvc cp target/x86_64-pc-windows-msvc/release/lemur.exe output -# Bundle for Windows -cargo bundle --release --target x86_64-pc-windows-msvc --format msi -cp target/x86_64-pc-windows-msvc/release/bundle/msi/Lemur.msi output - # Build for MacOS Intel cargo build --release --target x86_64-apple-darwin cp target/x86_64-apple-darwin/release/lemur output/lemur-osx-intel diff --git a/scripts/release.sh b/scripts/release.sh index 318742c..9ab6da0 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -3,4 +3,4 @@ if [ -z "${RELEASE_TOKEN}" ]; then exit 1 fi docker build -f build.Dockerfile -t lemur-build . -docker run -it --rm -e RELEASE_TOKEN="${RELEASE_TOKEN}" -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-release.sh \ No newline at end of file +MSYS_NO_PATHCONV=1 docker run -it --rm -e RELEASE_TOKEN="${RELEASE_TOKEN}" -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-release.sh \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index d700cd8..abab379 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ +// hide console in release mode +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] + use std::{path::PathBuf, process}; use anyhow::Result;