chore(actions): run snapshot validations on release branches (#306)

References #285
mcollovati · Oct 21, 2023 · 78a5b27 · 78a5b27
1 parent 9267c19
commit 78a5b27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/actions/run-validation/action.yaml b/.github/actions/run-validation/action.yaml
@@ -41,11 +41,14 @@ runs:
       shell: bash
       run: |
         set -x -e -o pipefail
-        mvn -B -N -ntp versions:set-property -Dproperty=hilla.version -DnewVersion=${{ inputs.hilla_version }} -DgenerateBackupPoms=false
+        if [[ "${{ inputs.hilla_version }}" != "main-SNAPSHOT" ]]; then
+          mvn -B -N -ntp versions:set-property -Dproperty=hilla.version -DnewVersion=${{ inputs.hilla_version }} -DgenerateBackupPoms=false
+        fi
         if [[ "${{ inputs.skip_vaadin_version_detection }}" == "false" ]]; then
           vaadin_version=$(mvn -ntp -N -Pdetect-vaadin-platform -q)-SNAPSHOT
+          hilla_version=$(mvn -ntp -N -q help:evaluate -Dexpression=hilla.version -DforceStdout)
           mvn -B -ntp versions:set-property -Dproperty=vaadin.version -DnewVersion=$vaadin_version -DgenerateBackupPoms=false -Pit-tests
-          echo "Running Validation with Hilla ${{ inputs.hilla_version }} and Vaadin $vaadin_version">> "$GITHUB_STEP_SUMMARY"
+          echo "Running Validation for Hilla $hilla_version and Vaadin $vaadin_version ">> "$GITHUB_STEP_SUMMARY"
         fi
         mvn -V -e -B -ntp -DskipTests -Dmaven.javadoc.skip=false install
     - name: Test

diff --git a/.github/workflows/validation-nightly.yaml b/.github/workflows/validation-nightly.yaml
@@ -5,11 +5,11 @@ on:
     - cron: '0 1 * * *'
 jobs:
   snapshot-main:
-    name: "Quarkus-Hilla main"
+    name: "Quarkus-Hilla"
     strategy:
       fail-fast: false
       matrix:
-        hilla: ["2.3-SNAPSHOT", "2.2-SNAPSHOT", "2.1-SNAPSHOT"]
+        branch: ["main", "2.2", "2.1"]
         java: [ 17, 20 ]
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -18,9 +18,9 @@ jobs:
         uses: actions/checkout@v3
       - uses: ./.github/actions/run-validation
         with:
-          ref: ${{ github.event_name == 'schedule' && 'main' || github.ref }}
+          ref: ${{ matrix.branch }}
           java_version: ${{ matrix.java }}
-          hilla_version: ${{ matrix.hilla }}
+          hilla_version: ${{ matrix.branch }}-SNAPSHOT
   snapshot-1_0:
     name: "Quarkus-Hilla 1.x"
     strategy: