aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
-rw-r--r--build.xml36
2 files changed, 9 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml
index fb32befb..e6cf96cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,15 @@ before_install:
69script: 69script:
70 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist 70 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
71 - ant prepare-$DB 71 - ant prepare-$DB
72
73 - echo "travis_fold:start:migrations"
74 - php bin/console doctrine:migrations:migrate --no-interaction --env=test
75 - echo "travis_fold:end:migrations"
76
77 - echo "travis_fold:start:fixtures"
78 - php bin/console doctrine:fixtures:load --no-interaction --env=test
79 - echo "travis_fold:end:fixtures"
80
72 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi; 81 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
73 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; 82 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
74 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 83 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
diff --git a/build.xml b/build.xml
index b5727e62..b9fe6136 100644
--- a/build.xml
+++ b/build.xml
@@ -62,18 +62,6 @@
62 <arg value="data/sql/mysql_base.sql"/> 62 <arg value="data/sql/mysql_base.sql"/>
63 <arg value="--env=test"/> 63 <arg value="--env=test"/>
64 </exec> 64 </exec>
65 <exec executable="php">
66 <arg value="${basedir}/bin/console"/>
67 <arg value="doctrine:migrations:migrate"/>
68 <arg value="--no-interaction"/>
69 <arg value="--env=test"/>
70 </exec>
71 <exec executable="php">
72 <arg value="${basedir}/bin/console"/>
73 <arg value="doctrine:fixtures:load"/>
74 <arg value="--no-interaction"/>
75 <arg value="--env=test"/>
76 </exec>
77 </target> 65 </target>
78 66
79 <target name="prepare_sqlite" description="Run test for SQLite"> 67 <target name="prepare_sqlite" description="Run test for SQLite">
@@ -103,18 +91,6 @@
103 <arg value="doctrine:schema:create"/> 91 <arg value="doctrine:schema:create"/>
104 <arg value="--env=test"/> 92 <arg value="--env=test"/>
105 </exec> 93 </exec>
106 <exec executable="php">
107 <arg value="${basedir}/bin/console"/>
108 <arg value="doctrine:migrations:migrate"/>
109 <arg value="--no-interaction"/>
110 <arg value="--env=test"/>
111 </exec>
112 <exec executable="php">
113 <arg value="${basedir}/bin/console"/>
114 <arg value="doctrine:fixtures:load"/>
115 <arg value="--no-interaction"/>
116 <arg value="--env=test"/>
117 </exec>
118 </target> 94 </target>
119 95
120 <target name="prepare_pgsql" description="Run test for PostgreSQL"> 96 <target name="prepare_pgsql" description="Run test for PostgreSQL">
@@ -149,18 +125,6 @@
149 <arg value="-f"/> 125 <arg value="-f"/>
150 <arg value="data/sql/pgsql_base.sql"/> 126 <arg value="data/sql/pgsql_base.sql"/>
151 </exec> 127 </exec>
152 <exec executable="php">
153 <arg value="${basedir}/bin/console"/>
154 <arg value="doctrine:migrations:migrate"/>
155 <arg value="--no-interaction"/>
156 <arg value="--env=test"/>
157 </exec>
158 <exec executable="php">
159 <arg value="${basedir}/bin/console"/>
160 <arg value="doctrine:fixtures:load"/>
161 <arg value="--no-interaction"/>
162 <arg value="--env=test"/>
163 </exec>
164 </target> 128 </target>
165 129
166 <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage"> 130 <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">