[ARVADOS] created: 1.1.1-121-g49b6770

Git user git at public.curoverse.com
Thu Nov 30 15:15:22 EST 2017


        at  49b677017609aba3ef018faac3e17f546df67ce3 (commit)


commit 49b677017609aba3ef018faac3e17f546df67ce3
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Thu Nov 30 17:15:12 2017 -0300

    12771: add version as param
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 41fddb9..28d5de4 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -10,7 +10,8 @@
 # older packages.
 LICENSE_PACKAGE_TS=20151208015500
 
-RAILS_PACKAGE_ITERATION=$(curl --silent https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber)
+RAILS_PACKAGE_ITERATION=1
+
 
 debug_echo () {
     echo "$@" >"$STDOUT_IF_DEBUG"
@@ -38,19 +39,23 @@ format_last_commit_here() {
 }
 
 version_from_latest_tag() {
-  # Generates a version number from the git log latest tag
-  # for the current directory, and writes it to stdout.
-  latest_tag=`git describe --abbrev=0`
-  #replace . with space so can split into an array
-  version_bits=(${latest_tag//./ })
-  #get number parts and increase last one by 1
-  vnum1=${version_bits[0]}
-  vnum2=${version_bits[1]}
-  vnum3=${version_bits[2]}
-  vnum3=$((vnum3+1))
-  new_version_tag="$vnum1.$vnum2.$vnum3"
-  git rev-parse HEAD >Changelog
-  echo "${new_version_tag}"   
+  if [[ $VERSION != "" ]] ; then
+      return $VERSION
+  else
+      # Generates a version number from the git log latest tag
+      # for the current directory, and writes it to stdout.
+      latest_tag=`git describe --abbrev=0`
+      #replace . with space so can split into an array
+      version_bits=(${latest_tag//./ })
+      #get number parts and increase last one by 1
+      vnum1=${version_bits[0]}
+      vnum2=${version_bits[1]}
+      vnum3=${version_bits[2]}
+      vnum3=$((vnum3+1))
+      new_version_tag="$vnum1.$vnum2.$vnum3"
+      git rev-parse HEAD >Changelog
+     echo "${new_version_tag}"   
+  fi
 }
 
 version_from_git() {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list