From 4726d37f988476ab4d31d8d969a211aedd92aa51 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Wed, 27 Sep 2023 16:27:27 +0200 Subject: [PATCH] [build] fix build e2e paths to use installed rector package --- .github/workflows/build_scoped_rector.yaml | 3 -- .../.github/workflows/e2e.yaml | 4 +-- .../.github/workflows/e2e_diff.yaml | 4 +-- .../.github/workflows/e2e_php72.yaml | 2 +- .../.github/workflows/e2e_php74.yaml | 33 ------------------- 5 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 build/target-repository/.github/workflows/e2e_php74.yaml diff --git a/.github/workflows/build_scoped_rector.yaml b/.github/workflows/build_scoped_rector.yaml index 8fc5697b0a0..feac1ee521c 100644 --- a/.github/workflows/build_scoped_rector.yaml +++ b/.github/workflows/build_scoped_rector.yaml @@ -136,6 +136,3 @@ jobs: git push --quiet origin main git tag ${GITHUB_REF#refs/tags/} -m "${GITHUB_REF#refs/tags/}" git push --quiet origin ${GITHUB_REF#refs/tags/} - - # run bare run test - - run: cd remote-repository && composer update && bin/rector list --ansi && cd .. diff --git a/build/target-repository/.github/workflows/e2e.yaml b/build/target-repository/.github/workflows/e2e.yaml index a6855653df2..3096e5fd894 100644 --- a/build/target-repository/.github/workflows/e2e.yaml +++ b/build/target-repository/.github/workflows/e2e.yaml @@ -33,9 +33,9 @@ jobs: coverage: none - - run: composer install --ansi + run: composer require rector/rector --dev working-directory: ${{ matrix.directory }} - - run: ../../bin/rector process --dry-run --ansi + run: vendor/bin/rector process --dry-run --ansi working-directory: ${{ matrix.directory }} diff --git a/build/target-repository/.github/workflows/e2e_diff.yaml b/build/target-repository/.github/workflows/e2e_diff.yaml index ec962962fbc..9eb00429dc7 100644 --- a/build/target-repository/.github/workflows/e2e_diff.yaml +++ b/build/target-repository/.github/workflows/e2e_diff.yaml @@ -30,9 +30,9 @@ jobs: coverage: none - - run: composer install --ansi + run: composer require rector/rector --dev working-directory: ${{ matrix.directory }} - - run: ../../bin/rector --ansi + run: vendor/bin/rector process --dry-run --ansi working-directory: ${{ matrix.directory }} diff --git a/build/target-repository/.github/workflows/e2e_php72.yaml b/build/target-repository/.github/workflows/e2e_php72.yaml index 5a1d2c2ba62..32953990c98 100644 --- a/build/target-repository/.github/workflows/e2e_php72.yaml +++ b/build/target-repository/.github/workflows/e2e_php72.yaml @@ -24,7 +24,7 @@ jobs: - run: sleep 40 - - run: composer install --ansi + run: composer require rector/rector --ansi working-directory: e2e/reflection-union-php72 - diff --git a/build/target-repository/.github/workflows/e2e_php74.yaml b/build/target-repository/.github/workflows/e2e_php74.yaml deleted file mode 100644 index f85efaba581..00000000000 --- a/build/target-repository/.github/workflows/e2e_php74.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# This workflow runs system tests: Use the Rector application from the source -# checkout to process "fixture" projects in tests/system-tests -# to see if those can be processed successfully -name: End to End tests on PHP 7.4 - -on: - pull_request: null - push: - branches: - - main - -jobs: - end_to_end_on_php74: - runs-on: ubuntu-latest - - name: End to end test - PHP 7.4 and Match class name - - steps: - - uses: actions/checkout@v4 - - - uses: shivammathur/setup-php@v2 - with: - php-version: "7.4" - coverage: none - - - - run: composer install --ansi - working-directory: e2e/parse-match-class-on-php74 - - - - run: vendor/bin/rector process --ansi - working-directory: e2e/parse-match-class-on-php74 -