status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-24 20:51:10 +00:00
Code Issues Projects Releases Wiki Activity

Make sure the release builds for the UI version to be consistent with the binary version.

Browse Source
This commit is contained in:
Matt Keeler 2018-06-26 09:39:34 -04:00
parent 714ef5e43e
commit f32308b574
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-support/functions/20-build.sh
View File

@ -26,6 +26,7 @@ function build_ui {
# Arguments: # Arguments:
# $1 - Path to the top level Consul source # $1 - Path to the top level Consul source
# $2 - The docker image to run the build within (optional) # $2 - The docker image to run the build within (optional)
# $3 - Version override
# #
# Returns: # Returns:
# 0 - success # 0 - success
@ -52,6 +53,11 @@ function build_ui {
# parse the version # parse the version
version=$(parse_version "${sdir}") version=$(parse_version "${sdir}")
if test -n "$3"
then
version="$3"
fi
local commit_hash="${GIT_COMMIT}" local commit_hash="${GIT_COMMIT}"
if test -z "${commit_hash}" if test -z "${commit_hash}"
then then

3
build-support/functions/30-release.sh
View File

@ -448,7 +448,8 @@ function build_release {
fi fi
status_stage "==> Building UI for version ${vers}" status_stage "==> Building UI for version ${vers}"
build_ui "${sdir}" "${UI_BUILD_TAG}" # passing the version to override the version determined via tags
build_ui "${sdir}" "${UI_BUILD_TAG}" "${vers}"
if test $? -ne 0 if test $? -ne 0
then then
err "ERROR: Failed to build the ui" err "ERROR: Failed to build the ui"