Skip to content

Commit

Permalink
Modify CodeQL with manual java build. Hopefully this will work.
Browse files Browse the repository at this point in the history
Updated Checkstyle configuration, adding more comments and removing
unused modules.
  • Loading branch information
leerho committed Dec 19, 2024
1 parent 7a4b686 commit c0fcb55
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 90 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/manual-codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ jobs:

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# -name: Autobuild
# uses: github/codeql-action/autobuild@v3

# Command-line programs to run using the OS shell.
# See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -51,6 +52,16 @@ jobs:
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

# Note: Autobuild fails thus the following manual build
- name: Manual Build With Java 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Java Compile
run: mvn clean compile

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
Expand Down
50 changes: 0 additions & 50 deletions tools/CloverConfig.txt

This file was deleted.

15 changes: 6 additions & 9 deletions tools/SketchesCheckstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ under the License.
<property name="fileNamePattern" value=".*[\\/]src[\\/]test[\\/].*$"/>
</module>

<!-- flag the first instance of a tab character in each java, xml, yml or yaml file -->
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
<property name="fileExtensions" value="java, xml, yml, yaml"/>
</module>

<!-- each package must have a package-info.java file -->
<module name="JavadocPackage"/>

<module name="NewlineAtEndOfFile">
Expand All @@ -67,6 +69,7 @@ under the License.
<!-- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> -->
</module>

<!-- Filters -->
<module name="SuppressWithPlainTextCommentFilter">
<property name="offCommentFormat" value="//CHECKSTYLE.OFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="//CHECKSTYLE.ON\: ([\w\|]+)"/>
Expand All @@ -80,13 +83,6 @@ under the License.
<!-- Be able to ignore violations with @SuppressWarnings -->
<!-- See https://checkstyle.org/filters/suppresswarningsfilter.html -->
<module name="SuppressWarningsHolder"/>

<!--
<module name="SuppressionFilter">
<property name="file" value="basedir/tools/suppressions.xml"/>
<property name="optional" value="false"/>
</module>
-->

<!-- Annotations -->
<module name="AnnotationLocation">
Expand Down Expand Up @@ -230,7 +226,8 @@ under the License.
<property name="allowedAnnotations" value="Override, Test"/>
</module>

<!-- <module name="JavadocParagraph"/> disabled because of a Checkstyle bug with <p> after @param -->
<!-- disabled because of a Checkstyle bug with <p> after @param -->
<!-- <module name="JavadocParagraph"/> -->

<module name="JavadocTagContinuationIndentation">
<property name="severity" value="ignore"/>
Expand Down
29 changes: 0 additions & 29 deletions tools/suppressions.xml

This file was deleted.

0 comments on commit c0fcb55

Please sign in to comment.