diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 694895d5..1350a836 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -2,13 +2,18 @@ name: Build and test on: push: branches: [ feature/**, develop ] - pull_request: + pull_request_target: branches: [ develop ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + checks: write + id-token: write + jobs: build_artifacts: name: Build artifacts @@ -20,7 +25,7 @@ jobs: secrets: inherit tests_linux_ru: - name: Test on Linux 8.3.21.1895 ru_RU + name: Tests Linux 8.3.21.1895 ru_RU uses: ./.github/workflows/run-tests-linux.yml needs: build_artifacts with: @@ -29,7 +34,7 @@ jobs: secrets: inherit tests_linux_en: - name: Test on Linux 8.3.21.1895 en_US + name: Tests Linux 8.3.21.1895 en_US uses: ./.github/workflows/run-tests-linux.yml needs: build_artifacts with: @@ -40,7 +45,7 @@ jobs: secrets: inherit tests_windows_ru: - name: Test on Windows 8.3.21.1895 ru_RU + name: Tests Windows 8.3.21.1895 ru_RU uses: ./.github/workflows/run-tests-windows.yml needs: build_artifacts with: @@ -49,7 +54,7 @@ jobs: secrets: inherit tests_macos_ru: - name: Test on MacOS 8.3.21.1895 ru_RU + name: Tests MacOS 8.3.21.1895 ru_RU uses: ./.github/workflows/run-tests-macos.yml needs: build_artifacts with: diff --git a/.github/workflows/run-tests-linux.yml b/.github/workflows/run-tests-linux.yml index 5fd7272c..232a255a 100644 --- a/.github/workflows/run-tests-linux.yml +++ b/.github/workflows/run-tests-linux.yml @@ -153,14 +153,15 @@ jobs: uses: actions/upload-artifact@v3 if: always() with: - name: report-linux-${{ inputs.v8_version }}-${{ inputs.locale }} + name: Tests report. Linux ${{ inputs.v8_version }} ${{ inputs.locale }} path: reports/*.* - name: Publish Test Report uses: mikepenz/action-junit-report@v3 if: always() with: + job_name: Tests Linux ${{ inputs.v8_version }} ${{ inputs.locale }} + check_name: Tests report. Linux ${{ inputs.v8_version }} ${{ inputs.locale }} report_paths: reports/report.xml fail_on_failure: ${{ inputs.fail_on_failure }} - require_passed_tests: ${{ inputs.fail_on_failure }} - update_check: true \ No newline at end of file + require_passed_tests: true \ No newline at end of file diff --git a/.github/workflows/sq.yml b/.github/workflows/sq.yml index ec3173c6..4fe09291 100644 --- a/.github/workflows/sq.yml +++ b/.github/workflows/sq.yml @@ -43,7 +43,8 @@ jobs: -Dsonar.host.url=https://sonar.openbsl.ru -Dsonar.branch.name=${{ env.BRANCH_NAME }} -Dsonar.projectVersion=${{ steps.extract_version.outputs.version }} - + -Dsonar.qualitygate.wait=true + -Dsonar.qualitygate.timeout=300 # Анализ проекта в SonarQube (PR) # https://docs.sonarqube.org/latest/analysis/pull-request/ - name: Анализ в SonarQube (pull-request) @@ -57,3 +58,5 @@ jobs: -Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} -Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }} -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} + -Dsonar.qualitygate.wait=true + -Dsonar.qualitygate.timeout=300