From 3e5427a95b711d0ead44b7a462dfdb234ceb1b8c Mon Sep 17 00:00:00 2001 From: Arnie Date: Wed, 19 Dec 2018 06:41:08 +0100 Subject: [PATCH] - Support php 7 and 5.6 - Support TypeScript --- code-formatter/Makefile | 4 ++-- code-formatter/src/inc/variables.shinc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code-formatter/Makefile b/code-formatter/Makefile index c4ce603..a9520ae 100644 --- a/code-formatter/Makefile +++ b/code-formatter/Makefile @@ -23,9 +23,9 @@ all : build release build : - docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.2 . + docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 . docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 . - docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.2 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) + docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) release : build docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) diff --git a/code-formatter/src/inc/variables.shinc b/code-formatter/src/inc/variables.shinc index f458513..5529719 100644 --- a/code-formatter/src/inc/variables.shinc +++ b/code-formatter/src/inc/variables.shinc @@ -32,7 +32,7 @@ __initVariables() { CSS_FILES+=("${1}") fi ;; - *.js|*.jsx) + *.js|*.jsx|*.ts) __path_exists "${1}" if [[ $? -ne 0 ]]; then __err "Specified path does not exist: ${1}"