Merge branch 'main' into dependabot/npm_and_yarn/ui.frontend/braces-3…

….0.3
valtech-ch · Sep 17, 2024 · edd810d · edd810d
2 parents e8cc535 + 0d72ca6
commit edd810d
Show file tree

Hide file tree

Showing 2 changed files with 350 additions and 175 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,41 +11,40 @@ jobs:
   build:
     name: Build maven
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'zulu'
-      - name: Build with Maven
+      - uses: actions/checkout@v4
+
+      - name: Set up Java ENV
+        uses: actions/setup-java@v4
+        with: # The last version will be used by default and available globally via JAVA_HOME.
+          java-version: |
+            17
+            8
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build and Test with Maven
+        env:
+          JAVA_HOME: ${{ env.JAVA_HOME_8_X64 }}
         run: mvn clean install
-  sonarcloud:
-    name: Sonarcloud Analysis
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
+
       - name: Cache SonarCloud packages
         uses: actions/cache@v1
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
+
       - name: Cache Maven packages
         uses: actions/cache@v1
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
+
+      - name: Analyze with SonarQube
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=valtech-ch_saas-aem-module
+          JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}
+        run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=valtech-ch_saas-aem-module