Skip to content

Commit c0fcb55

Browse files
committed
Modify CodeQL with manual java build. Hopefully this will work.
Updated Checkstyle configuration, adding more comments and removing unused modules.
1 parent 7a4b686 commit c0fcb55

File tree

4 files changed

+19
-90
lines changed

4 files changed

+19
-90
lines changed

.github/workflows/manual-codeql-analysis.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ jobs:
3838

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

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

55+
# Note: Autobuild fails thus the following manual build
56+
- name: Manual Build With Java 17
57+
uses: actions/setup-java@v4
58+
with:
59+
java-version: '17'
60+
distribution: 'temurin'
61+
62+
- name: Java Compile
63+
run: mvn clean compile
64+
5465
- name: Perform CodeQL Analysis
5566
uses: github/codeql-action/analyze@v3
5667
with:

tools/CloverConfig.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.

tools/SketchesCheckstyle.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ under the License.
4949
<property name="fileNamePattern" value=".*[\\/]src[\\/]test[\\/].*$"/>
5050
</module>
5151

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

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

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

72+
<!-- Filters -->
7073
<module name="SuppressWithPlainTextCommentFilter">
7174
<property name="offCommentFormat" value="//CHECKSTYLE.OFF\: ([\w\|]+)"/>
7275
<property name="onCommentFormat" value="//CHECKSTYLE.ON\: ([\w\|]+)"/>
@@ -80,13 +83,6 @@ under the License.
8083
<!-- Be able to ignore violations with @SuppressWarnings -->
8184
<!-- See https://checkstyle.org/filters/suppresswarningsfilter.html -->
8285
<module name="SuppressWarningsHolder"/>
83-
84-
<!--
85-
<module name="SuppressionFilter">
86-
<property name="file" value="basedir/tools/suppressions.xml"/>
87-
<property name="optional" value="false"/>
88-
</module>
89-
-->
9086

9187
<!-- Annotations -->
9288
<module name="AnnotationLocation">
@@ -230,7 +226,8 @@ under the License.
230226
<property name="allowedAnnotations" value="Override, Test"/>
231227
</module>
232228

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

235232
<module name="JavadocTagContinuationIndentation">
236233
<property name="severity" value="ignore"/>

tools/suppressions.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)