From d14a078804dc5e59d548a7d38a10301c89923420 Mon Sep 17 00:00:00 2001 From: Akolzin Dmitry Date: Tue, 24 Mar 2020 11:36:32 +0300 Subject: [PATCH] Update deployment (#97) * fix deploy stage --- Makefile | 14 +++++++------- intaro.retailcrm/include.php | 2 +- phpunit.xml.dist | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 31b7da58..a37456b6 100755 --- a/Makefile +++ b/Makefile @@ -40,14 +40,14 @@ create_db: echo "USE mysql;\nUPDATE user SET password=PASSWORD('root') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root mysqladmin create $(DB_BITRIX_NAME) --user=$(DB_BITRIX_LOGIN) --password=$(DB_BITRIX_PASS) -build_release: build_release_dir - bash bin/build $(VERSION) $(ROOT_DIR)/release/ - -build_release_dir: build_diff_file - php bin/build-release - -build_diff_file: +build_release: +ifneq ($(LAST_TAG),$(CURRENT_VERSION)) git diff --name-status $(LAST_TAG) HEAD > $(ROOT_DIR)/release/diff + php bin/build-release + bash bin/build $(VERSION) $(ROOT_DIR)/release/ +else + @exit 0 +endif cleanup: @rm -rf $(ROOT_DIR)/release/$(VERSION) diff --git a/intaro.retailcrm/include.php b/intaro.retailcrm/include.php index e6c2a4cf..5fbc529a 100644 --- a/intaro.retailcrm/include.php +++ b/intaro.retailcrm/include.php @@ -23,4 +23,4 @@ CModule::AddAutoloadClasses( 'RetailCrm\Exception\InvalidJsonException' => 'classes/general/Exception/InvalidJsonException.php', 'RetailCrm\Exception\CurlException' => 'classes/general/Exception/CurlException.php', ) -); \ No newline at end of file +); diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cad808bd..1f34a4a3 100755 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -11,7 +11,7 @@ stopOnFailure="false" > - + tests