release/github.sh

@@ -8,9 +8,10 @@ then
     exit 1
 fi
 
-TAG="$(git describe --abbrev=0 --tags | sed 's/* //')"
+TAG="$(git describe --abbrev=0 --tags | sed 's/* //')"  # v1.2.3
+VERSION=$(echo $TAG | sed 's/v//')  # 1.2.3
 DATE="$(date +"%Y-%m-%d")"
-NAME="Release $TAG ($DATE)"
+NAME="Release $VERSION ($DATE)"
 
 GH_REPO="repos/bazelbuild/buildtools"
 GH_AUTH_HEADER="Authorization: token $GITHUB_ACCESS_TOKEN"
@@ -21,11 +22,11 @@ bazel clean
 bazel build --config=release //buildifier:all //buildozer:all //unused_deps:all
 
 for tool in "buildifier" "buildozer" "unused_deps"; do
-  cp bazel-out/*-opt-*/bin/"$tool/$tool-linux_amd64" $BIN_DIR
-  cp bazel-out/*-opt-*/bin/"$tool/$tool-linux_arm64" $BIN_DIR
-  cp bazel-out/*-opt-*/bin/"$tool/$tool-darwin_amd64" $BIN_DIR
-  cp bazel-out/*-opt-*/bin/"$tool/$tool-darwin_arm64" $BIN_DIR
-  cp bazel-out/*-opt-*/bin/"$tool/$tool-windows_amd64.exe" $BIN_DIR
+  cp bazel-bin/"$tool/$tool-linux_amd64" $BIN_DIR
+  cp bazel-bin/"$tool/$tool-linux_arm64" $BIN_DIR
+  cp bazel-bin/"$tool/$tool-darwin_amd64" $BIN_DIR
+  cp bazel-bin/"$tool/$tool-darwin_arm64" $BIN_DIR
+  cp bazel-bin/"$tool/$tool-windows_amd64.exe" $BIN_DIR
 done;
 
 echo "Creating a draft release"

status.py

@@ -15,11 +15,12 @@ def run(*cmd):
 
 def main():
     tags = run("git", "describe", "--tags")
-    print("STABLE_buildVersion", tags.split("-")[0])
+    version = tags.lstrip('v')
+    print("STABLE_buildVersion", version)
 
     # rules_nodejs expects to read from volatile-status.txt
-    print("BUILD_SCM_VERSION", tags.split("-")[0])
-    
+    print("BUILD_SCM_VERSION", version)
+
     revision = run("git", "rev-parse", "HEAD")
     print("STABLE_buildScmRevision", revision)