status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix use of toolversion by using absolute GIT_ROOT 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-01-21 16:29:33 +01:00
parent 66c2d0d9cb
commit 0ce74b1da9
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/Makefile
View File

@ -1,4 +1,5 @@
GIT_COMMIT = $(shell git rev-parse --short HEAD) GIT_COMMIT = $(shell git rev-parse --short HEAD)
GIT_ROOT = $(shell git rev-parse --show-toplevel)
# Software Versions, URLs, and Checksums # Software Versions, URLs, and Checksums
NVM_VERSION = v0.33.11 NVM_VERSION = v0.33.11
@ -6,8 +7,6 @@ NVM_INSTALL_SCRIPT = nvm_$(NVM_VERSION)_install.sh
NVM_NODE_VERSION = v10.14.0 NVM_NODE_VERSION = v10.14.0
LEIN_VERSION = stable LEIN_VERSION = stable
GIT_ROOT = $(shell git rev-parse --show-toplevel)
# WARNING: Remember to change the tag when updating the image # WARNING: Remember to change the tag when updating the image
IMAGE_TAG = 1.0.0 IMAGE_TAG = 1.0.0
IMAGE_NAME = statusteam/status-build-base:$(IMAGE_TAG) IMAGE_NAME = statusteam/status-build-base:$(IMAGE_TAG)

1
docker/linux/Makefile
View File

@ -1,6 +1,7 @@
__toolversion = $(shell $(GIT_ROOT)/scripts/toolversion $(1)) __toolversion = $(shell $(GIT_ROOT)/scripts/toolversion $(1))
GIT_COMMIT = $(shell git rev-parse --short HEAD) GIT_COMMIT = $(shell git rev-parse --short HEAD)
GIT_ROOT = $(shell git rev-parse --show-toplevel)
# WARNING: Change version in Dockerfile too # WARNING: Change version in Dockerfile too
QT_VERSION = 5.11.2 QT_VERSION = 5.11.2

1
docker/windows/Makefile
View File

@ -1,6 +1,7 @@
__toolversion = $(shell $(GIT_ROOT)/scripts/toolversion $(1)) __toolversion = $(shell $(GIT_ROOT)/scripts/toolversion $(1))
GIT_COMMIT = $(shell git rev-parse --short HEAD) GIT_COMMIT = $(shell git rev-parse --short HEAD)
GIT_ROOT = $(shell git rev-parse --show-toplevel)
# WARNING: Remember to change the tag when updating the image # WARNING: Remember to change the tag when updating the image
IMAGE_TAG = 1.1.1 IMAGE_TAG = 1.1.1

4
scripts/lib/setup/packages.sh
View File

@ -4,6 +4,8 @@
# Install checks # Install checks
######## ########
GIT_ROOT=$(git rev-parse --show-toplevel)
function program_exists() { function program_exists() {
local program=$1 local program=$1
command -v "$program" >/dev/null 2>&1 command -v "$program" >/dev/null 2>&1
@ -25,7 +27,7 @@ function program_version_exists() {
} }
function toolversion() { function toolversion() {
./toolversion "${1}" ${GIT_ROOT}/scripts/toolversion "${1}"
} }
######## ########