diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d454146 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# Keep shell scripts LF even on Windows checkouts so bash on Linux hosts +# doesn't choke on trailing CRs (e.g. "set: pipefail: invalid parameter name"). +*.sh text eol=lf diff --git a/scripts/build-linux-docker.sh b/scripts/build-linux-docker.sh index 9f267db..ecd4e7d 100644 --- a/scripts/build-linux-docker.sh +++ b/scripts/build-linux-docker.sh @@ -4,7 +4,7 @@ set -euo pipefail # Optional first argument mirrors build-linux.sh. The Docker build still writes # the final artifact into the local dist/ tree, not into the container. The # default includes the application version and target platform. -version="$(sed -n 's/^var Version = "\(.*\)"/\1/p' src/app/version.go)" +version="$(sed -n 's/^var Version = "\(.*\)"/\1/p' src/app/version.go | tr -d '\r')" version="${version:-0.0.0-dev}" tag="gitea.mixdep.ru/mix/gosentry-builder:${version}" output="${1:-dist/linux/gosentry-${version}-linux-amd64}" diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index 23b16d3..9c68152 100644 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -3,7 +3,7 @@ set -euo pipefail # Optional first argument lets a developer or CI job choose the output path. The # default includes the application version and target platform. -version="$(sed -n 's/^var Version = "\(.*\)"/\1/p' src/app/version.go)" +version="$(sed -n 's/^var Version = "\(.*\)"/\1/p' src/app/version.go | tr -d '\r')" version="${version:-0.0.0-dev}" output="${1:-dist/linux/gosentry-${version}-linux-amd64}" mkdir -p "$(dirname "$output")" diff --git a/scripts/build-release-linux.sh b/scripts/build-release-linux.sh index b3f8dea..fc3942e 100644 --- a/scripts/build-release-linux.sh +++ b/scripts/build-release-linux.sh @@ -9,7 +9,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" repo_root="$(cd "${script_dir}/.." && pwd)" cd "$repo_root" -version="$(sed -n 's/^var Version = "\(.*\)"/\1/p' src/app/version.go)" +version="$(sed -n 's/^var Version = "\(.*\)"/\1/p' src/app/version.go | tr -d '\r')" version="${version:-0.0.0-dev}" tag="gitea.mixdep.ru/mix/gosentry-builder:${version}"