Skip to content

Commit 63740c2

Browse files
metacosmcsviri
andcommitted
feat: run spotless on compile (#2330)
Signed-off-by: Chris Laprun <claprun@redhat.com> Co-authored-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 7e7b399 commit 63740c2

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/e2e-test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
sample_operators_tests:
2020
strategy:
2121
matrix:
22-
sample_dir:
22+
sample:
2323
- "sample-operators/mysql-schema"
2424
- "sample-operators/tomcat-operator"
2525
- "sample-operators/webpage"
@@ -48,12 +48,10 @@ jobs:
4848
run: mvn install -DskipTests
4949

5050
- name: Run integration tests in local mode
51-
working-directory: ${{ matrix.sample_dir }}
5251
run: |
53-
mvn test -P end-to-end-tests
52+
mvn test -P end-to-end-tests -pl ${{ matrix.sample }}
5453
5554
- name: Run E2E tests as a deployment
56-
working-directory: ${{ matrix.sample_dir }}
5755
run: |
5856
eval $(minikube -p minikube docker-env)
59-
mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote
57+
mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote -pl ${{ matrix.sample }}

pom.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,11 @@
314314
<pom>
315315
<includes>
316316
<include>pom.xml</include>
317-
<include>./**/pom.xml</include>
317+
<include>./**/pom.xml</include>
318318
</includes>
319-
<sortPom></sortPom>
319+
<sortPom>
320+
<expandEmptyElements>false</expandEmptyElements>
321+
</sortPom>
320322
</pom>
321323
<java>
322324
<eclipse>
@@ -325,9 +327,17 @@
325327
<importOrder>
326328
<file>contributing/eclipse.importorder</file>
327329
</importOrder>
328-
<removeUnusedImports></removeUnusedImports>
330+
<removeUnusedImports/>
329331
</java>
330332
</configuration>
333+
<executions>
334+
<execution>
335+
<goals>
336+
<goal>apply</goal>
337+
</goals>
338+
<phase>compile</phase>
339+
</execution>
340+
</executions>
331341
</plugin>
332342
<plugin>
333343
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)