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

…on-workflow
mcollovati · Dec 24, 2023 · 52a6fd5 · 52a6fd5
2 parents 976616b + 807cf75
commit 52a6fd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.circleci/config.yml → .circleci/config.yml.old b/.circleci/config.yml → .circleci/config.yml.old
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -72,6 +72,8 @@ jobs:
           set -x -e -o pipefail
           mvn -V -e -B -ntp -DskipTests -Dmaven.javadoc.skip=false install
       - name: Test
+        env:
+          VAADIN_PRO_KEY: ${{ secrets.VAADIN_PROKEY }}
         run: |
           set -x -e -o pipefail
           mvn -V -e -B -ntp verify -Dmaven.javadoc.skip=false -DtrimStackTrace=false
@@ -109,11 +111,18 @@ jobs:
         run: |
           set -x -e -o pipefail
           mvn -V -e -B -ntp -DskipTests -Dmaven.javadoc.skip=false install
+      - name: Set Chrome Version
+        run: |
+          CHROME_VERSION=$(google-chrome --version | sed 's/^Google Chrome //' | cut -d. -f1)
+          echo "CHROME_VERSION=${CHROME_VERSION}" >> "$GITHUB_ENV"
       - name: UI Test
+        env:
+          VAADIN_PRO_KEY: ${{ secrets.VAADIN_PROKEY }}
         run: |
           set -x -e -o pipefail
           cd vertx-vaadin-tests
           mvn -V -e -B -ntp verify -Dmaven.javadoc.skip=false -DtrimStackTrace=false \ 
+            -Duitest.chrome-version=$CHROME_VERSION \
             -Dtest.vertx.jvmArgs="-Dorg.slf4j.simpleLogger.logFile=target/verticle.log -Dvaadin.require.home.node=true -Xmx2048M -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory"
       - name: Package test output files
         if: ${{ failure() || success() }}