浏览代码

build, jenkins: Jenkins version tag should be same as when building manually

Jakob Borg 9 年之前
父节点
当前提交
3e51206a6b
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 3 0
      build.go
  2. 1 1
      jenkins/common.bash

+ 3 - 0
build.go

@@ -298,6 +298,9 @@ func runCommand(cmd string, target target) {
 			}
 			}
 		}
 		}
 
 
+	case "version":
+		fmt.Println(getVersion())
+
 	default:
 	default:
 		log.Fatalf("Unknown command %q", cmd)
 		log.Fatalf("Unknown command %q", cmd)
 	}
 	}

+ 1 - 1
jenkins/common.bash

@@ -23,7 +23,7 @@ function init {
     rm -f *.tar.gz *.zip *.deb
     rm -f *.tar.gz *.zip *.deb
     cd src/github.com/syncthing/syncthing
     cd src/github.com/syncthing/syncthing
 
 
-    version=$(git describe)
+    version=$(go run build.go version)
     echo "Building $version"
     echo "Building $version"
     echo
     echo
 }
 }