Skip to content

Check style only on Travis CI #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yan Zhang (Eskibear) merged 4 commits into from
Aug 7, 2019
Merged

Check style only on Travis CI #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4c367b
Check style only on Travis CI
Eskibear Aug 5, 2019
b02623f
Update pom.xml
Eskibear Aug 5, 2019
12a2487
Update pom.xml
Eskibear Aug 5, 2019
d3cb3f9
update indent
Eskibear Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ os:

script:
- ./mvnw clean verify
- ./mvnw checkstyle:check

cache:
directories:
Expand Down
4 changes: 2 additions & 2 deletions check_style.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<property name="fileExtensions" value="java, properties, xml"/>
<module name="RegexpHeader">
<property name="headerFile" value="${basedir}/microsoft.header"/>
<property name="headerFile" value="microsoft.header"/>
</module>
<!-- Checks for whitespace
See http://checkstyle.sf.net/config_whitespace.html -->
Expand Down Expand Up @@ -289,4 +289,4 @@
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
</module>
</module>
</module>
26 changes: 15 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<base.name>Java Debug Server for Visual Studio Code</base.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho-version>1.2.0</tycho-version>
<checkstyleDir>${basedir}</checkstyleDir>
</properties>

<licenses>
Expand Down Expand Up @@ -113,15 +114,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand All @@ -135,8 +127,7 @@
</dependency>
</dependencies>
<configuration>
<configLocation>${project.parent.basedir}/check_style.xml</configLocation>
<propertyExpansion>basedir=${project.parent.basedir}</propertyExpansion>
<configLocation>${checkstyleDir}/check_style.xml</configLocation>
<failOnViolation>true</failOnViolation>
</configuration>
</plugin>
Expand All @@ -148,6 +139,19 @@
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>activate-in-module</id>
<activation>
<file>
<exists>${basedir}/../check_style.xml</exists>
</file>
</activation>
<properties>
<checkstyleDir>${basedir}/..</checkstyleDir>
</properties>
</profile>
</profiles>
<repositories>
<repository>
<id>photon</id>
Expand Down