diff --git a/.github/workflows/pre-testing.yml b/.github/workflows/pre-testing.yml deleted file mode 100644 index 8925f04..0000000 --- a/.github/workflows/pre-testing.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Pre-testing checks - -on: - push: - branches: [ develop ] - pull_request: - branches: [ develop ] - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout code - run: echo "Success" \ No newline at end of file diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5622c34..878e8e0 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -3,20 +3,11 @@ # All rights reserved. name: Тестирование - -on: - workflow_run: - workflows: ["Pre-testing checks"] - types: - - completed - -permissions: - checks: write - contents: read +# Любой пуш и pr в проекте +on: [push, pull_request] jobs: test: - if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -26,7 +17,6 @@ jobs: os: [windows-latest, ubuntu-22.04] locale: ['ru_RU'] fail-fast: false - steps: - name: Установка локали if: matrix.os == startsWith(matrix.os, 'windows') @@ -40,8 +30,6 @@ jobs: uses: actions/checkout@v4.2.2 with: fetch-depth: 0 - repository: ${{ github.event.workflow_run.head_repository.full_name }} - ref: ${{ github.event.workflow_run.head_sha }} # Установка OneScript конкретной версии - name: Установка OneScript