diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f91cb952..698fd34b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v2 - name: Set Image Version run: echo "IMAGE_VERSION=${GITHUB_SHA:0:7}" >> $GITHUB_ENV - - name: SonarCloud Scan webui, cli + - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any @@ -42,23 +42,6 @@ jobs: run: docker build -t $WEBUI_TAG:$IMAGE_VERSION webui - name: Run Server Tests run: server/gradlew --no-daemon -p server check - - name: Cache SonarCloud packages - uses: actions/cache@v3 - with: - path: ~/.sonar/cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - name: Cache Gradle packages - uses: actions/cache@v3 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle - - name: SonarCloud Scan server - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: server/gradlew --no-daemon -p server build sonar --info - name: Build Server Image run: docker build -t $SERVER_TAG:$IMAGE_VERSION server - name: Push Docker Images diff --git a/sonar-project.properties b/sonar-project.properties index eabec1197..561175e26 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.organization=open-vsx #sonar.projectVersion=1.0 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. -sonar.sources=cli,webui +#sonar.sources=. # Encoding of the source code. Default is default system encoding #sonar.sourceEncoding=UTF-8