Merge pull request #19 from patchlevel/improve-workflow

improve workflow
patchlevel · Dec 23, 2021 · e0ce4ee · e0ce4ee
2 parents f42ce46 + 877afab
commit e0ce4ee
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    allow:
+      - dependency-type: "direct"
+    schedule:
+      interval: "daily"
+    versioning-strategy: "increase"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -46,15 +46,15 @@ jobs:
 
             - name: "Install lowest dependencies"
               if: ${{ matrix.dependencies == 'lowest' }}
-              run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+              run: "composer update --prefer-lowest --no-interaction --no-progress"
 
             - name: "Install highest dependencies"
               if: ${{ matrix.dependencies == 'highest' }}
-              run: "composer update --no-interaction --no-progress --no-suggest"
+              run: "composer update --no-interaction --no-progress"
 
             - name: "Install locked dependencies"
               if: ${{ matrix.dependencies == 'locked' }}
-              run: "composer install --no-interaction --no-progress --no-suggest"
+              run: "composer install --no-interaction --no-progress"
 
             - name: "Coding Standard"
               run: "vendor/bin/phpcs"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -46,15 +46,15 @@ jobs:
 
             - name: "Install lowest dependencies"
               if: ${{ matrix.dependencies == 'lowest' }}
-              run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+              run: "composer update --prefer-lowest --no-interaction --no-progress"
 
             - name: "Install highest dependencies"
               if: ${{ matrix.dependencies == 'highest' }}
-              run: "composer update --no-interaction --no-progress --no-suggest"
+              run: "composer update --no-interaction --no-progress"
 
             - name: "Install locked dependencies"
               if: ${{ matrix.dependencies == 'locked' }}
-              run: "composer install --no-interaction --no-progress --no-suggest"
+              run: "composer install --no-interaction --no-progress"
 
             - name: "PHPStan"
               run: "vendor/bin/phpstan analyse"
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -19,14 +19,19 @@ jobs:
                 dependencies:
                     - "lowest"
                     - "highest"
-                    - "locked"
                 php-version:
                     - "7.4"
                     - "8.0"
                 operating-system:
                     - "ubuntu-latest"
                     - "windows-latest"
-
+                include:
+                  - dependencies: "locked"
+                    php-version: "7.4"
+                    operating-system: "ubuntu-latest"
+                  - dependencies: "locked"
+                    php-version: "7.4"
+                    operating-system: "windows-latest"
         steps:
             - name: "Checkout"
               uses: "actions/checkout@v2"
@@ -50,15 +55,15 @@ jobs:
 
             - name: "Install lowest dependencies"
               if: ${{ matrix.dependencies == 'lowest' }}
-              run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+              run: "composer update --prefer-lowest --no-interaction --no-progress"
 
             - name: "Install highest dependencies"
               if: ${{ matrix.dependencies == 'highest' }}
-              run: "composer update --no-interaction --no-progress --no-suggest"
+              run: "composer update --no-interaction --no-progress"
 
             - name: "Install locked dependencies"
               if: ${{ matrix.dependencies == 'locked' }}
-              run: "composer install --no-interaction --no-progress --no-suggest"
+              run: "composer install --no-interaction --no-progress"
 
             - name: "Tests"
               run: "vendor/bin/phpunit --coverage-clover=clover.xml --coverage-text"
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -46,15 +46,15 @@ jobs:
 
             - name: "Install lowest dependencies"
               if: ${{ matrix.dependencies == 'lowest' }}
-              run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+              run: "composer update --prefer-lowest --no-interaction --no-progress"
 
             - name: "Install highest dependencies"
               if: ${{ matrix.dependencies == 'highest' }}
-              run: "composer update --no-interaction --no-progress --no-suggest"
+              run: "composer update --no-interaction --no-progress"
 
             - name: "Install locked dependencies"
               if: ${{ matrix.dependencies == 'locked' }}
-              run: "composer install --no-interaction --no-progress --no-suggest"
+              run: "composer install --no-interaction --no-progress"
 
             - name: "psalm"
               run: "vendor/bin/psalm --shepherd --stats"