Merge branch 'refactor/simplify-project-structure' into test/validati…

…on-workflow
mcollovati · Dec 26, 2023 · 42ce318 · 42ce318
2 parents e90f168 + 43a91f6
commit 42ce318
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -72,10 +72,10 @@ jobs:
           set -x -e -o pipefail
           VERTX_VAADIN_VERSION=$(mvn -N -ntp -q help:evaluate -Dexpression=project.version -DforceStdout)
           echo "VERTX_VAADIN_VERSION=${VERTX_VAADIN_VERSION}" >> "$GITHUB_ENV"
-          mvn -V -e -B -ntp -DskipTests -Dmaven.javadoc.skip=false install -Pflow-ui-tests
+          mvn -V -e -B -ntp -DskipTests install -Pflow-ui-tests
       - name: Save workspace
         run: |
-          tar cf workspace.tar -C ~/ $(cd ~/ && echo .m2/repository/com/github/mcollovati/vertx/*/$VERTX_VAADIN_VERSION)
+          tar cf workspace.tar -C ~/ $(cd ~/ && echo .m2/repository/com/github/mcollovati/vertx/**/$VERTX_VAADIN_VERSION)
           tar rf workspace.tar $(find . -d -name target)
       - uses: actions/upload-artifact@v3
         with:
@@ -132,7 +132,7 @@ jobs:
           name: tests-output
           path: tests-report-*.tgz
   it-tests-1:
-    name: UI tests
+    name: UI tests 1
     needs: [build]
     if: ${{ needs.changes.outputs.validation-required == 'true' }}
     timeout-minutes: 30
@@ -191,7 +191,7 @@ jobs:
           name: tests-output
           path: tests-report-*.tgz
   it-tests-2:
-    name: UI tests
+    name: UI tests 2
     needs: [build]
     if: ${{ needs.changes.outputs.validation-required == 'true' }}
     timeout-minutes: 30

diff --git a/vertx-vaadin-tests/pom.xml b/vertx-vaadin-tests/pom.xml
@@ -145,10 +145,8 @@
                     <configuration>
                         <trimStackTrace>false</trimStackTrace>
                         <enableAssertions>true</enableAssertions>
-                        <!--
-                        <parallel>none</parallel>
-                        <threadCount>1</threadCount>
-                        -->
+                        <parallel>all</parallel>
+                        <threadCount>2</threadCount>
                         <rerunFailingTestsCount>3</rerunFailingTestsCount>
                         <systemPropertyVariables>
                             <com.vaadin.testbench.Parameters.testsInParallel>4