diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2e851d2f..6e6fcbe3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@master with: distribution: 'adopt' - java-version: '17' + java-version: 17 cache: 'maven' # 3、打包 - name: Build @@ -59,7 +59,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit fetch-depth: 0 # a full history is required for pull request analysis - - name: Scan + - name: Analyze uses: JetBrains/qodana-action@v2023.3 env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} @@ -67,10 +67,29 @@ jobs: sonar-scan: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@master with: fetch-depth: 0 - - name: Scan - uses: SonarSource/sonarcloud-github-action@master + - name: Setup Java + uses: actions/setup-java@master + with: + distribution: 'adopt' + java-version: 17 + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Analyze + run: mvn -B verify -Psonar env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/README.md b/README.md index d5542329..fc1e7915 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,18 @@ Release + +Sonar Status + + +ContiNew Starter + + +Spring Boot + + +Java + GitHub stars @@ -18,15 +30,6 @@ Gitee forks - -Release - - -Release - - -Release - 📚 [在线文档](https://doc.charles7c.top) | 🚀 [演示地址](https://cnadmin.charles7c.top)(账号/密码:admin/admin123) diff --git a/pom.xml b/pom.xml index 4e6a8d3f..a1d6f85b 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ 2.4.0-SNAPSHOT 1.5.1 + 3.9.1.2184 @@ -169,6 +170,39 @@ + + + + sonar + + https://sonarcloud.io + charles7c + Charles7c_continew-admin + ${project.groupId}:${project.artifactId} + + + false + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar.version} + + + verify + + sonar + + + + + + + + +