Skip to content

Commit 9e421ae

Browse files
committed
feat: run spotless on compile
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent f62ba49 commit 9e421ae

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
@@ -322,9 +322,11 @@
322322
<pom>
323323
<includes>
324324
<include>pom.xml</include>
325-
<inclide>./**/pom.xml</inclide>
325+
<include>./**/pom.xml</include>
326326
</includes>
327-
<sortPom></sortPom>
327+
<sortPom>
328+
<expandEmptyElements>false</expandEmptyElements>
329+
</sortPom>
328330
</pom>
329331
<java>
330332
<eclipse>
@@ -333,9 +335,17 @@
333335
<importOrder>
334336
<file>contributing/eclipse.importorder</file>
335337
</importOrder>
336-
<removeUnusedImports></removeUnusedImports>
338+
<removeUnusedImports/>
337339
</java>
338340
</configuration>
341+
<executions>
342+
<execution>
343+
<goals>
344+
<goal>apply</goal>
345+
</goals>
346+
<phase>compile</phase>
347+
</execution>
348+
</executions>
339349
</plugin>
340350
<plugin>
341351
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)