diff --git a/.gitattributes b/.gitattributes index c5b4ff3..0b0bfed 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,7 +3,7 @@ # Rust source *.rs text diff=rust -*.toml text +*.toml text eol=lf # Shell scripts must keep LF even on Windows *.sh text eol=lf @@ -24,4 +24,4 @@ docs/*.docx binary docs/*.xlsx binary # Binary / generated -- do not diff -Cargo.lock linguist-generated=true \ No newline at end of file +Cargo.lock linguist-generated=true diff --git a/build-release.sh b/build-release.sh index 0d229ed..e4bcaae 100644 --- a/build-release.sh +++ b/build-release.sh @@ -12,7 +12,7 @@ set -e # Read version from the single source of truth: Cargo.toml -BASE_VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/') +BASE_VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/' | tr -d '\r') if [ -z "$BASE_VERSION" ]; then echo "Error: Could not read version from Cargo.toml" exit 1