From 010628eca02bb680e6005a8a76e85350043f8637 Mon Sep 17 00:00:00 2001 From: Ingvar Vilkman Date: Sun, 7 Jun 2020 14:14:19 +0300 Subject: [PATCH 1/4] Sonar Scanner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Проверки: 1. Запуск проверки при пуше в Дев или Мастер 2. Запуск проверки при пул реквесте в Мастер --- .github/workflows/sonar-scanner.yml | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/sonar-scanner.yml diff --git a/.github/workflows/sonar-scanner.yml b/.github/workflows/sonar-scanner.yml new file mode 100644 index 000000000..b5e7f5131 --- /dev/null +++ b/.github/workflows/sonar-scanner.yml @@ -0,0 +1,45 @@ +name: sonar-scanner + +on: + pull_request: + branches: + - master + push: + branches: + - master + - develop + +jobs: + SonarScanner: + if: github.repository == 'BlizD/Tasks' + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: '' + - run: | + git fetch --prune --unshallow + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Setup SonarQube scanner + uses: warchant/setup-sonar-scanner@v1 + - name: Run SonarQube on push + if: github.event_name == 'push' + run: sonar-scanner + -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 + -X + -Dsonar.login=${{ secrets.SONAR_TOKEN }} + -Dsonar.host.url=https://sonar.openbsl.ru + -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 300d67dc08b2c422ff71bfa41530defdbc3f0964 Mon Sep 17 00:00:00 2001 From: Ingvar Vilkman Date: Sun, 7 Jun 2020 14:21:50 +0300 Subject: [PATCH 2/4] Create sonar-project.properties --- sonar-project.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sonar-project.properties diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000..f2f32f441 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,11 @@ +sonar.projectName=Tasks +sonar.projectKey=tasks + +sonar.sourceEncoding=UTF-8 +sonar.sources=./src +sonar.inclusions=**/*.bsl + +sonar.scm.enabled=true +sonar.scm.provider=git + +sonar.projectVersion=1.0.5.001 From edadfbc1158a1f106f5c1002d3fe505d1efb05c0 Mon Sep 17 00:00:00 2001 From: Ingvar Vilkman Date: Sun, 7 Jun 2020 14:25:20 +0300 Subject: [PATCH 3/4] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Бадж со статусом --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a7cdaebf7..a8d645eb9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Infostart](https://img.shields.io/badge/infostart-downloads%20500-blue.svg)](https://infostart.ru/public/552480/) [![1clancer.ru](https://img.shields.io/badge/1clancer.ru-downloads%20750-orange.svg)](http://1clancer.ru/catalog/2764) [![Github Releases](https://img.shields.io/github/downloads/BlizD/Tasks/latest/total.svg)]() +[![Quality Gate Status](https://sonar.openbsl.ru/api/project_badges/measure?project=tasks&metric=alert_status)](https://sonar.openbsl.ru/dashboard?id=tasks) [![telegram](https://img.shields.io/badge/telegram-channal-green.svg)](https://t.me/mtasks) [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/joinchat/KbD_hhM1tJGb3B3gz6QIvA) @@ -135,4 +136,4 @@ * Как, когда и кому отправляются уведомленияи - https://github.com/BlizD/Tasks/wiki/Уведомления * Telegram - настройка отправки уведомлений - https://github.com/BlizD/Tasks/wiki/Telegram---настройка-отправки-уведомлений * Настройка получения почты по протоколу IMAP - https://github.com/BlizD/Tasks/wiki/Настройка-получения-почты-по-протоколу-IMAP -* Как настроить загрузку изменений из хранилища, если хранилище серверное - https://github.com/BlizD/Tasks/wiki/Как-настроить-загрузку-изменений-из-хранилища,-если-хранилище-серверное \ No newline at end of file +* Как настроить загрузку изменений из хранилища, если хранилище серверное - https://github.com/BlizD/Tasks/wiki/Как-настроить-загрузку-изменений-из-хранилища,-если-хранилище-серверное From abf8136e611ff5e9d95c6a1e8dc00a44d3536462 Mon Sep 17 00:00:00 2001 From: Ingvar Vilkman Date: Sun, 7 Jun 2020 14:40:15 +0300 Subject: [PATCH 4/4] develop -> develope --- .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 b5e7f5131..4a1565fb0 100644 --- a/.github/workflows/sonar-scanner.yml +++ b/.github/workflows/sonar-scanner.yml @@ -7,7 +7,7 @@ on: push: branches: - master - - develop + - develope jobs: SonarScanner: