From 41feec4766dde61868bcc2c17eb77018e0f843cf Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 20 Aug 2021 16:47:55 -0600 Subject: [PATCH] Remove unused Sonar from Build Closes gh-10205 --- .../continuous-integration-workflow.yml | 41 ++----------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 18cd48f7ea..6283cfe5dc 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -78,42 +78,9 @@ jobs: export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace - sonar_analysis: - name: Static Code Analysis - needs: [prerequisites] - runs-on: ubuntu-latest - if: needs.prerequisites.outputs.runjobs - env: - SONAR_URL: ${{ secrets.SONAR_URL }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - steps: - - uses: actions/checkout@v2 - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: '11' - - name: Setup gradle user name - run: | - mkdir -p ~/.gradle - echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties - - name: Run Sonar on given (non-main) branch - if: ${{ github.ref != 'refs/heads/main' }} - run: | - export BRANCH=${GITHUB_REF#refs/heads/} - export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER" - export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" - export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" - ./gradlew sonarqube -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PexcludeProjects='**/samples/**' -Dsonar.projectKey="spring-security-${GITHUB_REF#refs/heads/}" -Dsonar.projectName="spring-security-${GITHUB_REF#refs/heads/}" -Dsonar.host.url="$SONAR_URL" -Dsonar.login="$SONAR_TOKEN" --stacktrace - - name: Run Sonar on main - if: ${{ github.ref == 'refs/heads/main' }} - run: | - export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER" - export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" - export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" - ./gradlew sonarqube -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PexcludeProjects='**/samples/**' -Dsonar.host.url="$SONAR_URL" -Dsonar.login="$SONAR_TOKEN" --stacktrace deploy_artifacts: name: Deploy Artifacts - needs: [build_jdk_11, snapshot_tests, sonar_analysis] + needs: [build_jdk_11, snapshot_tests] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -140,7 +107,7 @@ jobs: ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} deploy_docs: name: Deploy Docs - needs: [build_jdk_11, snapshot_tests, sonar_analysis] + needs: [build_jdk_11, snapshot_tests] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -164,7 +131,7 @@ jobs: DOCS_HOST: ${{ secrets.DOCS_HOST }} deploy_schema: name: Deploy Schema - needs: [build_jdk_11, snapshot_tests, sonar_analysis] + needs: [build_jdk_11, snapshot_tests] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -188,7 +155,7 @@ jobs: DOCS_HOST: ${{ secrets.DOCS_HOST }} notify_result: name: Check for failures - needs: [build_jdk_11, snapshot_tests, sonar_analysis, deploy_artifacts, deploy_docs, deploy_schema] + needs: [build_jdk_11, snapshot_tests, deploy_artifacts, deploy_docs, deploy_schema] if: failure() runs-on: ubuntu-latest steps: