Set up the 2.14 branch (#160)

Add a branch.txt file and use it as part of the release tag.
yugabyte · Feb 2, 2023 · 66b1038 · 66b1038
1 parent f4c0175
commit 66b1038
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/branch.txt b/branch.txt
@@ -0,0 +1 @@
+2.14
diff --git a/build_and_release.sh b/build_and_release.sh
@@ -155,7 +155,16 @@ fi
 
 original_repo_dir=$PWD
 git_sha1=$( git rev-parse HEAD )
-tag=v$( date +%Y%m%d%H%M%S )-${git_sha1:0:10}
+branch_file_path="$YB_THIRDPARTY_DIR/branch.txt"
+branch_name=""
+if [[ -f ${branch_file_path} ]]; then
+  branch_name=$(<"${branch_file_path}")
+fi
+tag=v
+if [[ -n ${branch_name} ]]; then
+  tag+="${branch_name}-"
+fi
+tag+=$( date +%Y%m%d%H%M%S )-${git_sha1:0:10}
 
 archive_dir_name=yugabyte-db-thirdparty-$tag
 if [[ -z ${YB_THIRDPARTY_ARCHIVE_NAME_SUFFIX:-} ]]; then

diff --git a/requirements_frozen.txt b/requirements_frozen.txt
@@ -13,10 +13,11 @@ pyparsing==2.4.7
 requests==2.26.0
 ruamel.yaml==0.17.16
 ruamel.yaml.clib==0.2.6
-sys-detection==1.1.2
+sys-detection==1.3.0
 toml==0.10.2
-typed-ast==1.4.3
+typed-ast==1.5.4
 typing-extensions==3.10.0.2
 urllib3==1.26.7
 websocket-client==1.2.1
 yugabyte-pycommon==1.9.15
+llvm-installer==1.0.2