From ab55b3006407d1e783da3310db896b5ca3b06b35 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 17 Feb 2024 20:30:03 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=82=D0=B0=D1=81=D0=BA=D0=B8=20=D1=81=D0=BE=D0=BD?= =?UTF-8?q?=D0=B0=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sonar-scanner.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sonar-scanner.yml b/.github/workflows/sonar-scanner.yml index 92a93e47b..5411adbd0 100644 --- a/.github/workflows/sonar-scanner.yml +++ b/.github/workflows/sonar-scanner.yml @@ -19,15 +19,16 @@ jobs: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: '' - run: | git fetch --prune --unshallow - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: java-version: 11 + distribution: 'temurin' - name: Setup SonarQube scanner uses: warchant/setup-sonar-scanner@v1 - name: Run SonarQube on push @@ -36,7 +37,6 @@ jobs: -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dsonar.host.url=https://sonar.openbsl.ru -Dsonar.branch.name=${GITHUB_REF#refs/heads/} - -Dsonar.bsl.languageserver.enabled=true - name: Run SonarQube on pull request if: github.event_name == 'pull_request' run: sonar-scanner @@ -46,4 +46,3 @@ jobs: -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} -Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} -Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }} - -Dsonar.bsl.languageserver.enabled=true From 3fd7d98ff339b458274645fc2d5d574ac7a2a559 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 17 Feb 2024 20:30:48 +0100 Subject: [PATCH 2/2] Jdk17 --- .github/workflows/sonar-scanner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonar-scanner.yml b/.github/workflows/sonar-scanner.yml index 5411adbd0..330fd056c 100644 --- a/.github/workflows/sonar-scanner.yml +++ b/.github/workflows/sonar-scanner.yml @@ -27,7 +27,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: 'temurin' - name: Setup SonarQube scanner uses: warchant/setup-sonar-scanner@v1