From 5bf02ae67af6ca83dab75a111406df8c508b94b4 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Mon, 27 Jan 2025 16:41:22 -0500 Subject: [PATCH] release_version.txt -> VERSION --- VERSION | 1 + build/build_release.sh | 10 +++++----- release_version.txt | 1 - utils/Makefile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 VERSION delete mode 100644 release_version.txt diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..c56a61d --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.9.8,release_version.txt -> VERSION diff --git a/build/build_release.sh b/build/build_release.sh index f6304ec..7364e5c 100755 --- a/build/build_release.sh +++ b/build/build_release.sh @@ -14,9 +14,9 @@ dist_user=cvttdist dist_host="cloud21.cvtt.vpn" dist_ssh_port="22" -dist_locations="cloud21.cvtt.vpn:22 hs01.cvtt.vpn:22" # ---------------- Settings - +dist_locations="cloud21.cvtt.vpn:22 hs01.cvtt.vpn:22" +version_file="VERSION" # ---------------- cmdline prj= brnch=master @@ -145,8 +145,8 @@ if [ "${?}" != "0" ]; then fi -release_version=$(cat release_version.txt | awk -F',' '{print $1}') -whats_new=$(cat release_version.txt | awk -F',' '{print $2}') +release_version=$(cat ${version_file} | awk -F',' '{print $1}') +whats_new=$(cat ${version_file} | awk -F',' '{print $2}') echo "--------------------------------" @@ -175,7 +175,7 @@ if [ "${project}" == "cvtt-rust" ]; then release_dir=${prj_dir}/dist/${project} cmd_arr+=("mkdir -p ${release_dir}") - cmd_arr+=("cp release_version.txt ${release_dir}") + cmd_arr+=("cp ${version_file} ${release_dir}") jq_cmd="jq '.packages[] | select(.targets[].kind[] == \"bin\") | .name'" apps=$(cargo metadata --no-deps --format-version 1 --manifest-path=${prj_dir}/Cargo.toml | eval $jq_cmd | uniq) diff --git a/release_version.txt b/release_version.txt deleted file mode 100644 index 695568f..0000000 --- a/release_version.txt +++ /dev/null @@ -1 +0,0 @@ -1.9.7,docker to use CONFIG_SERVICE diff --git a/utils/Makefile b/utils/Makefile index 3b75cbd..8ad38c4 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -6,7 +6,7 @@ SUBDIRS += configs FILES= -FILES += release_version.txt +FILES += VERSION all: install