lib/vx/builder/script_builder/go.rb in vx-builder-0.3.14 vs lib/vx/builder/script_builder/go.rb in vx-builder-0.4.0

@@ -12,38 +12,43 @@
 
               vxvm_install = "sudo vxvm install go #{go_version env}"
               i << trace_sh_command(%{VX_VM_SOURCE="$(#{vxvm_install})"}, trace: vxvm_install)
               i << %{source "$VX_VM_SOURCE"}
 
-              i << trace_sh_command('export GOPATH=$VX_ROOT/gopath')
-              i << trace_sh_command('export PATH=$GOPATH/bin:$PATH')
+              i << trace_sh_command('export VX_GOPATH=$VX_ROOT/gopath:$GOPATH')
+              i << trace_sh_command('export PATH=$VX_GOPATH/bin:$PATH')
               i << trace_sh_command('export VX_ORIG_CODE_ROOT=$(pwd)')
-              i << trace_sh_command('export VX_NEW_CODE_ROOT=$GOPATH/src/vexor.io/$CI_PROJECT_NAME')
+              i << trace_sh_command("export VX_NEW_CODE_ROOT=$VX_GOPATH/src/#{project_path env}")
 
               i << trace_sh_command('mkdir -p $VX_NEW_CODE_ROOT')
               i << trace_sh_command('rmdir $VX_NEW_CODE_ROOT')
               i << trace_sh_command('mv $VX_ORIG_CODE_ROOT $VX_NEW_CODE_ROOT')
               i << trace_sh_command('ln -s $VX_NEW_CODE_ROOT $VX_ORIG_CODE_ROOT')
               i << trace_sh_command('cd $VX_NEW_CODE_ROOT')
             end
 
             do_announce(env) do |i|
               i << trace_sh_command("go version")
+              i << trace_sh_command("go env")
             end
 
             do_install(env) do |i|
-              i << trace_sh_command("go get -t")
+              i << trace_sh_command("go get -v ./...")
             end
 
             do_script(env) do |i|
-              i << trace_sh_command("go test")
+              i << trace_sh_command("go test -v ./...")
             end
           end
 
           app.call(env)
         end
 
         private
+
+          def project_path(env)
+            "#{env.task.project_host}/#{env.task.name}"
+          end
 
           def enabled?(env)
             env.source.go.first || env.source.language == 'go'
           end