Skip to content

Commit

Permalink
minor: moves projects to test on under config
Browse files Browse the repository at this point in the history
  • Loading branch information
rnveach authored and nrmancuso committed Nov 27, 2022
1 parent a844187 commit 2ea0295
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 8 deletions.
15 changes: 10 additions & 5 deletions .ci/no-exception-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ openjdk17-with-checks-nonjavadoc-error)
sed -i.'' 's/value=\"error\"/value=\"ignore\"/' \
.ci-temp/contribution/checkstyle-tester/checks-nonjavadoc-error.xml
cd .ci-temp/contribution/checkstyle-tester
cp ../../../.ci/openjdk-projects-to-test-on.config openjdk-projects-to-test-on.config
sed -i '/ <!-- Filters -->/r ../../../.ci/openjdk17-excluded.files' checks-nonjavadoc-error.xml
cp ../../../config/projects-to-test/openjdk-projects-to-test-on.config \
openjdk-projects-to-test-on.config
sed -i '/ <!-- Filters -->/r ../../../config/projects-to-test/openjdk17-excluded.files' \
checks-nonjavadoc-error.xml
export MAVEN_OPTS="-Xmx2048m"
groovy ./diff.groovy --listOfProjects openjdk-projects-to-test-on.config \
--mode single --allowExcludes \
Expand All @@ -74,7 +76,8 @@ no-exception-lucene-and-others-javadoc)
BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
checkout_from https://github.com/checkstyle/contribution
cp .ci/projects-for-no-exception-javadoc.config .ci-temp/contribution/checkstyle-tester
cp config/projects-to-test/projects-for-no-exception-javadoc.config \
.ci-temp/contribution/checkstyle-tester
cd .ci-temp/contribution/checkstyle-tester
sed -i'' 's/^guava/#guava/' projects-for-no-exception-javadoc.config
sed -i'' 's/#infinispan/infinispan/' projects-for-no-exception-javadoc.config
Expand All @@ -95,7 +98,8 @@ no-exception-cassandra-storm-tapestry-javadoc)
echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
BRANCH=$(git rev-parse --abbrev-ref HEAD)
checkout_from https://github.com/checkstyle/contribution
cp .ci/projects-for-no-exception-javadoc.config .ci-temp/contribution/checkstyle-tester
cp config/projects-to-test/projects-for-no-exception-javadoc.config \
.ci-temp/contribution/checkstyle-tester
cd .ci-temp/contribution/checkstyle-tester
sed -i'' 's/^guava/#guava/' projects-for-no-exception-javadoc.config
sed -i'' 's/#tapestry-5/tapestry-5/' projects-for-no-exception-javadoc.config
Expand All @@ -115,7 +119,8 @@ no-exception-hadoop-apache-groovy-scouter-javadoc)
echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
BRANCH=$(git rev-parse --abbrev-ref HEAD)
checkout_from https://github.com/checkstyle/contribution
cp .ci/projects-for-no-exception-javadoc.config .ci-temp/contribution/checkstyle-tester
cp config/projects-to-test/projects-for-no-exception-javadoc.config \
.ci-temp/contribution/checkstyle-tester
cd .ci-temp/contribution/checkstyle-tester
sed -i'' 's/^guava/#guava/' projects-for-no-exception-javadoc.config
sed -i'' 's/#apache-commons/apache-commons/' projects-for-no-exception-javadoc.config
Expand Down
2 changes: 1 addition & 1 deletion config/checkstyle_non_main_files_suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
files="config[\\/]intellij-idea-inspection-scope.xml"/>

<!-- we must use full paths in file pattern property value -->
<suppress id="lineLength" files=".ci[\\/]openjdk17-excluded.files"/>
<suppress id="lineLength" files="config[\\/]projects-to-test[\\/]openjdk17-excluded.files"/>

<!-- this file cannot be line wrapped, It contains a list of suppressions -->
<suppress id="lineLength" files="config[\\/]pitest-suppressions[\\/].*"/>
Expand Down
2 changes: 1 addition & 1 deletion config/intellij-idea-inspection-scope.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
all excludes should be specified in build configuration -->
<component name="DependencyValidationManager">
<scope name="Checkstyle Inspection Scope"
pattern="!file[checkstyle]:target//*&amp;&amp;!file:src/test/resources*//**&amp;&amp;!file:src/it/resources*//**&amp;&amp;!file:src/site/resources/js/google-analytics.js&amp;&amp;!file:src/site/resources/styleguides*//**&amp;&amp;!file:config/intellij-idea-inspections.properties&amp;&amp;!file[checkstyle]:.ci-temp//*&amp;&amp;!file[checkstyle]:bin//*&amp;&amp;!file[checkstyle]:.settings//*&amp;&amp;!file:.classpath&amp;&amp;!file:.project&amp;&amp;!file:.circleci/config.yml&amp;&amp;!file:.ci/openjdk-projects-to-test-on.config&amp;&amp;!file:.ci/projects-for-no-exception-javadoc.config&amp;&amp;!file:.ci/pitest-survival-check-xml.groovy"/>
pattern="!file[checkstyle]:target//*&amp;&amp;!file:src/test/resources*//**&amp;&amp;!file:src/it/resources*//**&amp;&amp;!file:src/site/resources/js/google-analytics.js&amp;&amp;!file:src/site/resources/styleguides*//**&amp;&amp;!file:config/intellij-idea-inspections.properties&amp;&amp;!file[checkstyle]:.ci-temp//*&amp;&amp;!file[checkstyle]:bin//*&amp;&amp;!file[checkstyle]:.settings//*&amp;&amp;!file:.classpath&amp;&amp;!file:.project&amp;&amp;!file:.circleci/config.yml&amp;&amp;!file:config/projects-to-test/openjdk-projects-to-test-on.config&amp;&amp;!file:config/projects-for-no-exception-javadoc.config&amp;&amp;!file:.ci/pitest-survival-check-xml.groovy"/>
</component>
2 changes: 1 addition & 1 deletion config/jsoref-spellchecker/exclude.pl
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
/releasenotes_old.*\.xml$
/releasenotes\.xml$
/.*_..\.translation[^/]*$
/openjdk17-excluded\.files$
^cdg-pitest-licence.txt$
^.teamcity/
^config/projects-to-test/openjdk17-excluded\.files$
^config/checker-framework-suppressions/
^config/archunit-store/
^codeship.encrypted$
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,7 @@
<exclude>signatures-test.txt</exclude>
<exclude>archunit-store/**</exclude>
<exclude>jsoref-spellchecker/**</exclude>
<exclude>projects-to-test/**</exclude>
</excludes>
</validationSet>
<validationSet>
Expand Down

0 comments on commit 2ea0295

Please sign in to comment.