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

add missing __major_version method 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-02-01 10:52:19 +01:00
parent 50b4ef36b5
commit 424a2bb28b
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/linux/Makefile
View File

@ -1,4 +1,5 @@
__toolversion = $(shell $(GIT_ROOT)/scripts/toolversion $(1)) __toolversion = $(shell $(GIT_ROOT)/scripts/toolversion $(1))
__major_version = $(shell echo $(1) | cut -d. -f1,2)
GIT_COMMIT = $(shell git rev-parse --short HEAD) GIT_COMMIT = $(shell git rev-parse --short HEAD)
GIT_ROOT = $(shell git rev-parse --show-toplevel) GIT_ROOT = $(shell git rev-parse --show-toplevel)
@ -19,7 +20,6 @@ build: $(QT_ARCHIVE)
echo "DEPS_HASH not set"; \ echo "DEPS_HASH not set"; \
exit 1; \ exit 1; \
fi fi
docker build \ docker build \
--build-arg="BASE_IMAGE_TAG=$(BASE_IMAGE_TAG)" \ --build-arg="BASE_IMAGE_TAG=$(BASE_IMAGE_TAG)" \
--build-arg="NODE_VERSION=$(call __toolversion, node)" \ --build-arg="NODE_VERSION=$(call __toolversion, node)" \
@ -31,7 +31,7 @@ build: $(QT_ARCHIVE)
-t $(IMAGE_NAME) . -t $(IMAGE_NAME) .
$(QT_ARCHIVE): $(QT_ARCHIVE):
wget $(QT_URL)/$(call __major_version__, $(QT_VERSION))/$(QT_VERSION)/$(QT_ARCHIVE) wget $(QT_URL)/$(call __major_version, $(QT_VERSION))/$(QT_VERSION)/$(QT_ARCHIVE)
echo "$(QT_MD5SUM) $(QT_ARCHIVE)" | md5sum --check echo "$(QT_MD5SUM) $(QT_ARCHIVE)" | md5sum --check
push: build push: build