Skip to content

Validate formatting in CI and releases #1767

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
ctubbsii merged 2 commits into from
Nov 3, 2020
Merged

Validate formatting in CI and releases #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
768da90
Validate formatting in CI and releases
ctubbsii Nov 3, 2020
6a03026
List files in console output for rat check
ctubbsii Nov 3, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/maven-full-its.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Show the first log message
run: git log -n1
- name: Build with Maven (Fast Build)
run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -PskipQA
run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -DskipTests -DskipFormat -DverifyFormat
env:
MAVEN_OPTS: -Djansi.force=true
creatematrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-on-demand.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ on:
addOpts:
description: Additional options
required: true
default: -Dspotbugs.skip -Dcheckstyle.skip
default: -Dspotbugs.skip -Dcheckstyle.skip -DskipFormat -DverifyFormat

jobs:
mvn:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/maven.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Show the first log message
run: git log -n1
- name: Build with Maven (Fast Build)
run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -PskipQA
run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -DskipTests -DskipFormat -DverifyFormat
env:
MAVEN_OPTS: -Djansi.force=true
# more complete builds with tests
Expand All @@ -61,7 +61,7 @@ jobs:
matrix:
profile:
- {name: 'unit-tests', args: 'verify -PskipQA -DskipTests=false'}
- {name: 'qa-checks', args: 'verify javadoc:jar -Psec-bugs -DskipTests=true -Dspotbugs.timeout=3600000'}
- {name: 'qa-checks', args: 'verify javadoc:jar -Psec-bugs -DskipTests -Dspotbugs.timeout=3600000'}
- {name: 'hadoop-compat', args: 'package -DskipTests -Dhadoop.version=3.0.3'}
fail-fast: false
timeout-minutes: 60
Expand All @@ -81,7 +81,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven (${{ matrix.profile.name }})
run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }}
run: mvn -B -V -e -ntp "-Dstyle.color=always" -DskipFormat ${{ matrix.profile.args }}
env:
MAVEN_OPTS: -Djansi.force=true
- name: Upload unit test results
Expand Down
66 changes: 65 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<powermock.version>2.0.7</powermock.version>
<!-- timestamp for reproducible outputs, updated on release by the release plugin -->
<project.build.outputTimestamp>2020-08-27T15:56:15Z</project.build.outputTimestamp>
<rat.consoleOutput>true</rat.consoleOutput>
<!-- surefire/failsafe plugin option -->
<reuseForks>false</reuseForks>
<slf4j.version>1.7.30</slf4j.version>
Expand Down Expand Up @@ -939,7 +940,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<arguments>-P !autoformat,thrift -DskipTests</arguments>
<arguments>-P !autoformat,verifyformat,thrift -DskipTests</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean package</preparationGoals>
Expand Down Expand Up @@ -1505,6 +1506,69 @@
</pluginManagement>
</build>
</profile>
<profile>
<!-- off by default, but enable with '-P verifyformat' or '-DverifyFormat' -->
<id>verifyformat</id>
<activation>
<property>
<name>verifyFormat</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<executions>
<execution>
<id>sort-pom</id>
<goals>
<goal>verify</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>license-headers</id>
<goals>
<goal>check</goal>
</goals>
<phase>process-test-resources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<executions>
<execution>
<id>format-java-source</id>
<goals>
<goal>validate</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<executions>
<execution>
<id>sort-imports</id>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- on by default, but disable with '-P !autoformat' or '-DskipFormat' -->
<id>autoformat</id>
Expand Down