aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Boniface <joshua@boniface.me>2019-03-30 12:42:33 -0400
committerJoshua Boniface <joshua@boniface.me>2019-03-30 12:42:33 -0400
commit31aa6c486cdeb851dd7ef7c66a82a76302cc632f (patch)
tree86071b121f2a0087b1775e9c186df0028ce6e800
parent1d9133a5e871c84ca5cea5a7608c34378dc6663f (diff)
Get the version string from build.yaml
For the purposes of packaging, this makes more sense, since we can include additional appends to this version (e.g. `-rcX`) when we can't in the SharedVersion file. The previous commit to the bump_version script sets this as well.
-rwxr-xr-xdeployment/common.build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/deployment/common.build.sh b/deployment/common.build.sh
index d028e3a66..000872ea9 100755
--- a/deployment/common.build.sh
+++ b/deployment/common.build.sh
@@ -17,12 +17,12 @@ DEFAULT_PKG_DIR="pkg-dist"
DEFAULT_DOCKERFILE="Dockerfile"
DEFAULT_ARCHIVE_CMD="tar -xvzf"
-# Parse the version from the AssemblyVersion
+# Parse the version from the build.yaml version
get_version()
(
local ROOT=${1-$DEFAULT_ROOT}
- grep "AssemblyVersion" ${ROOT}/SharedVersion.cs \
- | sed -E 's/\[assembly: ?AssemblyVersion\("([0-9\.]+)"\)\]/\1/'
+ grep "version:" ${ROOT}/build.yaml \
+ | sed -E 's/version: "([0-9\.]+.*)"/\1/'
)
# Run a build