[ARVADOS] updated: 1.1.0-157-g0c3b77f

Git user git at public.curoverse.com
Mon Dec 4 10:15:26 EST 2017


Summary of changes:
 build/run-library.sh             | 2 +-
 services/crunch-run/crunchrun.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  0c3b77f80068f8f5924c9f94e64a48edcbce47c7 (commit)
       via  df658c5cf9ae6e86f94d1a6ef1de69ce7981cf97 (commit)
      from  3134a937ab5133d73c799618f2a53e21e7c8a460 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0c3b77f80068f8f5924c9f94e64a48edcbce47c7
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Dec 4 12:14:48 2017 -0300

    10666: Updated build script to pass the version number to go programs.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 5fc494c..029fefc 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -132,7 +132,7 @@ package_go_binary() {
       return 1
     fi
 
-    go get "git.curoverse.com/arvados.git/$src_path"
+    go get -ldflags "-X main.version=${version}" "git.curoverse.com/arvados.git/$src_path"
 
     declare -a switches=()
     systemd_unit="$WORKSPACE/${src_path}/${prog}.service"

commit df658c5cf9ae6e86f94d1a6ef1de69ce7981cf97
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Dec 4 11:46:04 2017 -0300

    10666: version string format fix.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 02ac872..4102781 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -1420,7 +1420,7 @@ func (runner *ContainerRunner) NewArvLogWriter(name string) io.WriteCloser {
 
 // Run the full container lifecycle.
 func (runner *ContainerRunner) Run() (err error) {
-	runner.CrunchLog.Printf("crunch-run %q started", version)
+	runner.CrunchLog.Printf("crunch-run %s started", version)
 	runner.CrunchLog.Printf("Executing container '%s'", runner.Container.UUID)
 
 	hostname, hosterr := os.Hostname()

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list