update Makefile

This commit is contained in:
Akolzin Dmitry 2020-03-04 09:48:30 +03:00
parent 97b8935764
commit 88f161fdc4
5 changed files with 3 additions and 76 deletions

View File

@ -20,9 +20,10 @@ delete_archive:
composer: clone_prestashop
ifeq ($(COMPOSER_IN_TESTS),1)
@cd $(ROOT_DIR)/../PrestaShop/tests && composer install
@cd $(PRESTASHOP_DIR) && git checkout $(BRANCH)
@cd $(PRESTASHOP_DIR)/tests && composer install
else
@cd $(ROOT_DIR)/../PrestaShop && composer install --prefer-dist --no-interaction --no-progress
@cd $(PRESTASHOP_DIR) && composer install --prefer-dist --no-interaction --no-progress
endif
clone_prestashop:

View File

@ -1,21 +0,0 @@
#!/usr/bin/env bash
if [ -z $TRAVIS_BUILD_DIR ]; then
exit 0;
fi
PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
cd $PRESTASHOP_DIR
if [ -z $BRANCH ]; then
if [ -f "tests/parameters.yml.travis" ]; then
cp tests/parameters.yml.travis app/config/parameters.yml
else
cp tests-legacy/parameters.yml.travis app/config/parameters.yml
fi
bash travis-scripts/install-prestashop
else
bash travis-scripts/install-prestashop.sh
fi

View File

@ -1,19 +0,0 @@
#!/usr/bin/env bash
if [ -z $TRAVIS_BUILD_DIR ]; then
exit 0;
fi
PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
cd ..
git clone https://github.com/PrestaShop/PrestaShop
cd PrestaShop
if ! [ -z $BRANCH ]; then
git checkout $BRANCH;
cd tests
composer install
else
composer install --prefer-dist --no-interaction --no-progress
fi

View File

@ -1,15 +0,0 @@
#!/usr/bin/env bash
if [ -z $TRAVIS_BUILD_DIR ]; then
exit 0;
fi
PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
if ! [ -z $BRANCH ]; then
phpunit
else
cd $PRESTASHOP_DIR
composer run-script create-test-db --timeout=0
php ../PrestaShop/vendor/bin/phpunit -c $TRAVIS_BUILD_DIR/phpunit.xml.dist
fi

View File

@ -1,19 +0,0 @@
#!/bin/bash
PRESTASHOP_DIR=$TRAVIS_BUILD_DIR/../PrestaShop
cd $PRESTASHOP_DIR
bash travis-scripts/setup-php-fpm.sh
echo "* Preparing Apache ...";
sudo a2enmod rewrite actions fastcgi alias
# Use default config
sudo cp -f tests/travis-ci-apache-vhost /etc/apache2/sites-available/000-default.conf
sudo sed -e "s?%PRESTASHOP_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
sudo chmod 777 -R $HOME
# Starting Apache
sudo service apache2 restart