From ae14436b08b98b188d0723f3422a28c4df28eba0 Mon Sep 17 00:00:00 2001 From: Thilo Schwarz Date: Mon, 24 Mar 2025 15:07:12 +0100 Subject: [PATCH] Simplify and merge Maven build and SonarCloud scan steps Consolidated the Maven build and SonarCloud analysis into a single step for efficiency. Removed redundant workflow definitions and ensured proper environment variable handling. This change reduces complexity and streamlines the CI/CD workflow. --- .github/workflows/build-and-test.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 8034957..bbc699f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,34 +26,11 @@ jobs: path: ~/.m2/repository key: maven restore-keys: maven - - name: Build with Maven and Test + - name: Build with Maven verify for sonar env: API_EMAIL: ${{ secrets.API_EMAIL }} API_KEY: ${{ secrets.API_KEY }} API_TOKEN: ${{ secrets.API_TOKEN }} - run: mvn clean test - - sonarcloud-scan: - needs: mvn-test - name: Build and analyze with sonarcloud - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 17 - uses: actions/setup-java@v4.5.0 - with: - distribution: 'corretto' - java-version: '17' - - name: Cache maven repository - uses: actions/cache@v4.2.0 - with: - path: ~/.m2/repository - key: maven - restore-keys: maven - - name: Build and analyze - 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=th-schwarz_DynDRest #-Dsonar.projectName=DynDRest + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=th-schwarz_CloudflareDNS-jav \ No newline at end of file