Fix: PEAR packages upgrade in Jenkins server has caused problems with
CodeSniffer. The exclusion directory was no longer taken. I restored the server backup.
This commit is contained in:
parent
025211fa3d
commit
c3dd8348fe
@ -21,7 +21,7 @@
|
|||||||
<parallel>
|
<parallel>
|
||||||
<!-- <antcall target="phpmd"/> -->
|
<!-- <antcall target="phpmd"/> -->
|
||||||
<antcall target="phpcpd"/>
|
<antcall target="phpcpd"/>
|
||||||
<antcall target="phpcs"/>
|
<!-- <antcall target="phpcs"/> -->
|
||||||
<antcall target="doxygen"/>
|
<antcall target="doxygen"/>
|
||||||
<antcall target="phploc"/>
|
<antcall target="phploc"/>
|
||||||
</parallel>
|
</parallel>
|
||||||
@ -72,8 +72,8 @@
|
|||||||
<exec executable="phpcs" dir="${basedir}">
|
<exec executable="phpcs" dir="${basedir}">
|
||||||
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
|
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
|
||||||
--report=checkstyle
|
--report=checkstyle
|
||||||
|
--report-file=${basedir}/hudson/logs/checkstyle.xml
|
||||||
--ignore=${ignorepaths},${ignoreregexp}
|
--ignore=${ignorepaths},${ignoreregexp}
|
||||||
--report-file=${basedir}/hudson/logs/checkstyle.xml
|
|
||||||
htdocs
|
htdocs
|
||||||
"/>
|
"/>
|
||||||
</exec>
|
</exec>
|
||||||
@ -98,5 +98,5 @@
|
|||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="hudson" depends="clean,phpunit,parallelTasks"/>
|
<target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
|
||||||
</project>
|
</project>
|
||||||
@ -2,7 +2,7 @@
|
|||||||
<project name="dolibarr" default="hudson" basedir=".">
|
<project name="dolibarr" default="hudson" basedir=".">
|
||||||
|
|
||||||
<!-- Exclude/ignore paths -->
|
<!-- Exclude/ignore paths -->
|
||||||
<property name="ignorepaths" value="${basedir}/htdocs/conf/*,${basedir}/htdocs/core/filemanagerdol/*,${basedir}/htdocs/includes/*" />
|
<property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
|
||||||
<property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
|
<property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
@ -69,10 +69,9 @@
|
|||||||
<target name="phpcs">
|
<target name="phpcs">
|
||||||
<exec executable="phpcs" dir="${basedir}">
|
<exec executable="phpcs" dir="${basedir}">
|
||||||
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
|
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
|
||||||
--ignore=${ignorepaths},${ignoreregexp}
|
|
||||||
--report=checkstyle
|
--report=checkstyle
|
||||||
--report-file=${basedir}/hudson/logs/checkstyle.xml
|
--report-file=${basedir}/hudson/logs/checkstyle.xml
|
||||||
-v
|
--ignore=${ignorepaths},${ignoreregexp}
|
||||||
htdocs
|
htdocs
|
||||||
"/>
|
"/>
|
||||||
</exec>
|
</exec>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user