hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Grunt and install-assets steps

Browse Source
This commit is contained in:
Benoît Burnichon
2015-12-01 09:45:33 +01:00
committed by Florian BLOUET
parent 966efde17a
commit abbb4b0120
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -35,8 +35,6 @@ before_install:
install: install:
- travis_retry npm install - travis_retry npm install
- travis_retry composer install --optimize-autoloader --dev --prefer-source - travis_retry composer install --optimize-autoloader --dev --prefer-source
- travis_retry ./node_modules/.bin/grunt install-assets
- "./bin/developer assets:compile-less"
before_script: before_script:
- mysql -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;' - mysql -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;'
- "./bin/developer system:uninstall" - "./bin/developer system:uninstall"

2
circle.yml
View File

@@ -27,8 +27,6 @@ dependencies:
post: post:
- if [[ ! -e elasticsearch-1.6.0 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz && tar -xvf elasticsearch-1.6.0.tar.gz && elasticsearch-1.6.0/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0; fi - if [[ ! -e elasticsearch-1.6.0 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz && tar -xvf elasticsearch-1.6.0.tar.gz && elasticsearch-1.6.0/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0; fi
- elasticsearch-1.6.0/bin/elasticsearch: {background: true} - elasticsearch-1.6.0/bin/elasticsearch: {background: true}
- ./node_modules/.bin/grunt install-assets
- "./bin/developer assets:compile-less"
database: database:

3
resources/vagrant/vms/phraseanet-php55-nginx/puphpet/files/exec-once/setup vendored
View File

@@ -71,7 +71,6 @@ sudo cp -rf * /usr/local/
# npm binaries # npm binaries
sudo npm install -g recess sudo npm install -g recess
sudo npm install -g grunt-cli
sudo npm install -g bower sudo npm install -g bower
sudo npm install -g uglify-js sudo npm install -g uglify-js
@@ -116,8 +115,6 @@ then
cd /var/www/phraseanet cd /var/www/phraseanet
sudo -u vagrant composer install -n --prefer-source --dev sudo -u vagrant composer install -n --prefer-source --dev
sudo -u vagrant npm install sudo -u vagrant npm install
sudo -u vagrant grunt install-assets
sudo -u vagrant bin/developer assets:compile-less
sudo -u vagrant rm -f /var/www/phraseanet/lib/conf.d/configuration.yml sudo -u vagrant rm -f /var/www/phraseanet/lib/conf.d/configuration.yml
mv /var/www/phraseanet/lib/conf.d/configuration.yml.bkp /var/www/phraseanet/lib/conf.d/configuration.yml mv /var/www/phraseanet/lib/conf.d/configuration.yml.bkp /var/www/phraseanet/lib/conf.d/configuration.yml
fi fi