From 25b8bae23437d2e4c4947830fe6be7ad3127be40 Mon Sep 17 00:00:00 2001
From: Oleg Zhulnev <plbsid@gmail.com>
Date: Tue, 12 Oct 2021 00:12:09 +0300
Subject: [PATCH] clean up pipeline

---
 .github/workflows/autoreview.yaml     |  3 +--
 .github/workflows/ci.yaml             | 19 +++++++++----------
 .github/workflows/mt-annotations.yaml |  3 +--
 .github/workflows/mt.yaml             |  6 ++----
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/autoreview.yaml b/.github/workflows/autoreview.yaml
index 98873d03a6..10fed59072 100644
--- a/.github/workflows/autoreview.yaml
+++ b/.github/workflows/autoreview.yaml
@@ -38,9 +38,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-${{ matrix.dependencies }}
+          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-
             composer-${{ runner.os }}-${{ matrix.php-version }}-
             composer-${{ runner.os }}-
             composer-
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 97504ef3af..fa8a50ec87 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,16 +18,15 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest]
         php-version: ['7.4']
-        dependencies: ['']
         coverage-driver: [pcov, xdebug]
         e2e-runner: ['bin/infection']
         include:
-          - { operating-system: 'windows-latest', php-version: '7.4', dependencies: '', coverage-driver: 'xdebug' }
-          - { operating-system: 'ubuntu-latest', php-version: '7.4', dependencies: '', coverage-driver: 'pcov' }
-          - { operating-system: 'ubuntu-latest', php-version: '8.0', dependencies: '', coverage-driver: 'pcov', e2e-runner: 'build/infection.phar' }
-          - { operating-system: 'ubuntu-latest', php-version: '8.1', dependencies: '', coverage-driver: 'pcov' }
+          - { operating-system: 'windows-latest', php-version: '7.4', coverage-driver: 'xdebug' }
+          - { operating-system: 'ubuntu-latest', php-version: '7.4', coverage-driver: 'pcov' }
+          - { operating-system: 'ubuntu-latest', php-version: '8.0', coverage-driver: 'pcov', e2e-runner: 'build/infection.phar' }
+          - { operating-system: 'ubuntu-latest', php-version: '8.1', coverage-driver: 'pcov' }
 
-    name: CI on ${{ matrix.operating-system }} with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }} ${{ matrix.dependencies }} with ${{ matrix.e2e-runner }}
+    name: CI on ${{ matrix.operating-system }} with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }} with ${{ matrix.e2e-runner }}
 
     steps:
       - name: Checkout code
@@ -49,7 +48,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-${{ matrix.dependencies }}
+          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}
           restore-keys: |
             composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-
             composer-${{ runner.os }}-${{ matrix.php-version }}-
@@ -58,7 +57,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer install --no-interaction --prefer-dist --no-progress ${{ matrix.dependencies }}
+          composer install --no-interaction --prefer-dist --no-progress
 
       - name: Run tests
         shell: bash
@@ -85,7 +84,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: tests/e2e/*/vendor
-          key: e2e-vendor-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('tests/e2e/*/composer.json') }}-${{ matrix.dependencies }}
+          key: e2e-vendor-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('tests/e2e/*/composer.json') }}
           restore-keys: |
             e2e-vendor-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('tests/e2e/*/composer.json') }}-
             e2e-vendor-${{ runner.os }}-${{ matrix.php-version }}-
@@ -96,7 +95,7 @@ jobs:
         shell: bash
         run: |
           ls tests/e2e/*/composer.json | xargs dirname |
-             xargs -I{} composer --working-dir={} install --no-interaction --prefer-dist --no-progress ${{ matrix.dependencies }}
+             xargs -I{} composer --working-dir={} install --no-interaction --prefer-dist --no-progress
 
       - name: Run a subset of E2E tests
         if: runner.os == 'Windows'
diff --git a/.github/workflows/mt-annotations.yaml b/.github/workflows/mt-annotations.yaml
index 889b24fc25..2b69cfa0b1 100644
--- a/.github/workflows/mt-annotations.yaml
+++ b/.github/workflows/mt-annotations.yaml
@@ -35,9 +35,8 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-${{ matrix.dependencies }}
+                  key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}
                   restore-keys: |
-                      composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-
                       composer-${{ runner.os }}-${{ matrix.php-version }}-
                       composer-${{ runner.os }}-
                       composer-
diff --git a/.github/workflows/mt.yaml b/.github/workflows/mt.yaml
index c4c7cbdc50..3182a0b3e7 100644
--- a/.github/workflows/mt.yaml
+++ b/.github/workflows/mt.yaml
@@ -22,7 +22,6 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest, windows-latest]
         php-version: ['7.4']
-        dependencies: ['']
         coverage-driver: [pcov]
 
     name: Mutation testing on ${{ matrix.operating-system }} with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }}
@@ -46,16 +45,15 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-${{ matrix.dependencies }}
+          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}-
             composer-${{ runner.os }}-${{ matrix.php-version }}-
             composer-${{ runner.os }}-
             composer-
 
       - name: Install dependencies
         run: |
-          composer update --no-interaction --prefer-dist --no-progress ${{ matrix.dependencies }}
+          composer update --no-interaction --prefer-dist --no-progress
 
       - name: Collect coverage report
         run: |