ci: remove no-suggest (#213)

monicahq · Feb 13, 2021 · a07a3b7 · a07a3b7
1 parent d578856
commit a07a3b7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -27,13 +27,14 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-v3-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}
           restore-keys: |
-            ${{ runner.os }}-composer-v3-${{ hashFiles('**/composer.json') }}
-            ${{ runner.os }}-composer-v3-
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-
+            ${{ runner.os }}-composer-v4-
 
       - name: Install dependencies
-        run: composer install --no-progress --no-interaction --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
 
       - name: Run psalm
         run: vendor/bin/psalm --output-format=github
@@ -61,13 +62,14 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-v3-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}
           restore-keys: |
-            ${{ runner.os }}-composer-v3-${{ hashFiles('**/composer.json') }}
-            ${{ runner.os }}-composer-v3-
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-
+            ${{ runner.os }}-composer-v4-
 
       - name: Install dependencies
-        run: composer install --no-progress --no-interaction --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
 
       - name : Run phpstan
         run: vendor/bin/phpstan analyse
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
         php-version: [7.3, 7.4]
         illuminate_version: [6.*, 7.*, 8.*]
         composer_flags:  ['', '--prefer-lowest']
-    name: PHP ${{ matrix.php-version }} | Illuminate ${{ matrix.illuminate_version }} | Composer Flags ${{ matrix.composer_flags }}
+    name: PHP ${{ matrix.php-version }} | Illuminate ${{ matrix.illuminate_version }} ${{ matrix.composer_flags }}
 
     steps:
       - name: Checkout sources
@@ -51,16 +51,18 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-v3-${{ matrix.illuminate_version }}${{ matrix.composer_flags }}-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel_version }}-${{ matrix.composer_flags }}
           restore-keys: |
-            ${{ runner.os }}-composer-v3-${{ matrix.illuminate_version }}${{ matrix.composer_flags }}-${{ hashFiles('**/composer.json') }}
-            ${{ runner.os }}-composer-v3-${{ hashFiles('**/composer.json') }}
-            ${{ runner.os }}-composer-v3-
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel_version }}-${{ matrix.composer_flags }}
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}-${{ matrix.laravel_version }}
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-${{ matrix.php-version }}
+            ${{ runner.os }}-composer-v4-${{ hashFiles('**/composer.json') }}-
+            ${{ runner.os }}-composer-v4-
 
       - name: Install dependencies with Illuminate ${{ matrix.illuminate_version }}
         run: |
           export COMPOSER_ROOT_VERSION=dev-master
-          composer require "illuminate/container:${{ matrix.illuminate_version }}" "illuminate/contracts:${{ matrix.illuminate_version }}" "illuminate/database:${{ matrix.illuminate_version }}" "illuminate/http:${{ matrix.illuminate_version }}" "illuminate/support:${{ matrix.illuminate_version }}" --no-interaction --no-progress --no-suggest --prefer-stable --prefer-dist ${{ matrix.composer_flags }}
+          composer require "illuminate/container:${{ matrix.illuminate_version }}" "illuminate/contracts:${{ matrix.illuminate_version }}" "illuminate/database:${{ matrix.illuminate_version }}" "illuminate/http:${{ matrix.illuminate_version }}" "illuminate/support:${{ matrix.illuminate_version }}" --no-interaction --no-progress --prefer-stable --prefer-dist ${{ matrix.composer_flags }}
 
       - name: Run test suite
         run: phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --log-junit ./results/results.xml --coverage-clover ./results/coverage.xml