Skip to content

Commit e47a5a1

Browse files
authored
Disable breaking 1es spotbug task and manage it directly in ci (#209)
1 parent 661cae5 commit e47a5a1

File tree

10 files changed

+171
-2
lines changed

10 files changed

+171
-2
lines changed

.github/workflows/build-validation.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ jobs:
4444
- name: Build with Gradle
4545
run: ./gradlew build -x test
4646

47+
- name: Run SpotBugs
48+
run: ./gradlew spotbugsMain spotbugsTest
49+
continue-on-error: false
50+
51+
- name: Upload SpotBugs reports
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: SpotBugs Reports
55+
path: '**/build/reports/spotbugs'
56+
if-no-files-found: ignore
57+
4758
- name: Run Unit Tests with Gradle
4859
run: |
4960
export JAVA_HOME=$JDK_11

azurefunctions/build.gradle

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
id 'java-library'
33
id 'maven-publish'
44
id 'signing'
5+
id 'com.github.spotbugs' version '5.2.1'
56
}
67

78
group 'com.microsoft'
@@ -85,3 +86,35 @@ java {
8586
withSourcesJar()
8687
withJavadocJar()
8788
}
89+
90+
spotbugs {
91+
toolVersion = '4.9.2'
92+
effort = 'max'
93+
reportLevel = 'high'
94+
ignoreFailures = true
95+
excludeFilter = file('spotbugs-exclude.xml')
96+
}
97+
98+
spotbugsMain {
99+
reports {
100+
html {
101+
required = true
102+
stylesheet = 'fancy-hist.xsl'
103+
}
104+
xml {
105+
required = true
106+
}
107+
}
108+
}
109+
110+
spotbugsTest {
111+
reports {
112+
html {
113+
required = true
114+
stylesheet = 'fancy-hist.xsl'
115+
}
116+
xml {
117+
required = true
118+
}
119+
}
120+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FindBugsFilter>
3+
<!-- Exclude test classes -->
4+
<Match>
5+
<Class name="~.*Test"/>
6+
</Match>
7+
8+
<!-- Exclude common false positives -->
9+
<Match>
10+
<BugPattern name="DM_CONVERT_CASE"/>
11+
</Match>
12+
13+
<!-- Exclude serialization related warnings -->
14+
<Match>
15+
<BugPattern name="SE_NO_SERIALVERSIONID"/>
16+
</Match>
17+
</FindBugsFilter>

azuremanaged/build.gradle

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ plugins {
1212
id 'idea'
1313
id 'maven-publish'
1414
id 'signing'
15+
id 'com.github.spotbugs' version '5.2.1'
1516
}
1617

1718
archivesBaseName = 'durabletask-azuremanaged'
@@ -114,3 +115,35 @@ java {
114115
withJavadocJar()
115116
}
116117

118+
spotbugs {
119+
toolVersion = '4.9.2'
120+
effort = 'max'
121+
reportLevel = 'high'
122+
ignoreFailures = true
123+
excludeFilter = file('spotbugs-exclude.xml')
124+
}
125+
126+
spotbugsMain {
127+
reports {
128+
html {
129+
required = true
130+
stylesheet = 'fancy-hist.xsl'
131+
}
132+
xml {
133+
required = true
134+
}
135+
}
136+
}
137+
138+
spotbugsTest {
139+
reports {
140+
html {
141+
required = true
142+
stylesheet = 'fancy-hist.xsl'
143+
}
144+
xml {
145+
required = true
146+
}
147+
}
148+
}
149+

azuremanaged/spotbugs-exclude.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FindBugsFilter>
3+
<!-- Exclude test classes -->
4+
<Match>
5+
<Class name="~.*Test"/>
6+
</Match>
7+
8+
<!-- Exclude common false positives -->
9+
<Match>
10+
<BugPattern name="DM_CONVERT_CASE"/>
11+
</Match>
12+
13+
<!-- Exclude serialization related warnings -->
14+
<Match>
15+
<BugPattern name="SE_NO_SERIALVERSIONID"/>
16+
</Match>
17+
</FindBugsFilter>

client/build.gradle

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id 'idea'
66
id 'maven-publish'
77
id 'signing'
8+
id 'com.github.spotbugs' version '5.2.1'
89
}
910

1011
group 'com.microsoft'
@@ -180,4 +181,36 @@ publishing {
180181
java {
181182
withSourcesJar()
182183
withJavadocJar()
184+
}
185+
186+
spotbugs {
187+
toolVersion = '4.9.2'
188+
effort = 'max'
189+
reportLevel = 'high'
190+
ignoreFailures = true
191+
excludeFilter = file('spotbugs-exclude.xml')
192+
}
193+
194+
spotbugsMain {
195+
reports {
196+
html {
197+
required = true
198+
stylesheet = 'fancy-hist.xsl'
199+
}
200+
xml {
201+
required = true
202+
}
203+
}
204+
}
205+
206+
spotbugsTest {
207+
reports {
208+
html {
209+
required = true
210+
stylesheet = 'fancy-hist.xsl'
211+
}
212+
xml {
213+
required = true
214+
}
215+
}
183216
}

client/spotbugs-exclude.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FindBugsFilter>
3+
<!-- Exclude generated protobuf code -->
4+
<Match>
5+
<Package name="com.microsoft.durabletask.protobuf"/>
6+
</Match>
7+
8+
<!-- Exclude test classes -->
9+
<Match>
10+
<Class name="~.*Test"/>
11+
</Match>
12+
13+
<!-- Exclude common false positives -->
14+
<Match>
15+
<BugPattern name="DM_CONVERT_CASE"/>
16+
</Match>
17+
18+
<!-- Exclude serialization related warnings -->
19+
<Match>
20+
<BugPattern name="SE_NO_SERIALVERSIONID"/>
21+
</Match>
22+
</FindBugsFilter>

eng/ci/official-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ extends:
2828
name: 1es-pool-azfunc
2929
image: 1es-windows-2022
3030
os: windows
31-
31+
sdl:
32+
spotBugs:
33+
enabled: false
3234
stages:
3335
- stage: BuildAndSign
3436
dependsOn: []
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b1e9c96572a9fa0b81829fe0e976cd39de91877e
1+
c85ef11430ff8e10e21105abb545b0803bb86c66

internal/durabletask-protobuf/protos/orchestrator_service.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ message PurgeInstanceFilter {
463463

464464
message PurgeInstancesResponse {
465465
int32 deletedInstanceCount = 1;
466+
google.protobuf.BoolValue isComplete = 2;
466467
}
467468

468469
message CreateTaskHubRequest {

0 commit comments

Comments
 (0)