Update CI

timacdonald · May 16, 2024 · 6673910 · 6673910
1 parent a0d3354
commit 6673910
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,24 +12,25 @@ jobs:
         name: 'Test'
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Get composer cache directory
               id: composer-cache
               run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
             - name: Cache dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                 path: ${{ steps.composer-cache.outputs.dir }}
-                key: ${{ runner.os }}-composer-${{ matrix.prefer }}-${{ hashFiles('**/composer.json') }}
-                restore-keys: ${{ runner.os }}-composer-${{ matrix.prefer }}-
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+                restore-keys: ${{ runner.os }}-composer-
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: '8.3'
                   coverage: pcov
+                  tools: infection, php-cs-fixer, phpstan
 
             - name: Install dependencies
               run: composer install
@@ -38,10 +39,10 @@ jobs:
               run: composer check-platform-reqs
 
             - name: PHP-CS-Fixer
-              run: ./vendor/bin/php-cs-fixer fix --dry-run
+              run: php-cs-fixer fix --dry-run
 
             - name: Infection
-              run: ./vendor/bin/infection --min-msi=100
+              run: infection --min-msi=100
 
             - name: PHPStan
-              run: ./vendor/bin/phpstan
+              run: phpstan
diff --git a/composer.json b/composer.json
@@ -19,11 +19,6 @@
         "php": "^8.1",
         "phpunit/phpunit": "^9.0 || ^10.0 || ^11.0"
     },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "infection/infection": "^0.28.1",
-        "phpstan/phpstan": "^1.4"
-    },
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
@@ -43,19 +38,6 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
-    "scripts": {
-        "fix": [
-            "./vendor/bin/php-cs-fixer fix"
-        ],
-        "lint": [
-            "./vendor/bin/php-cs-fixer fix --dry-run",
-            "./vendor/bin/phpstan analyse"
-        ],
-        "test": [
-            "./vendor/bin/phpunit",
-            "./vendor/bin/infection --threads=8"
-        ]
-    },
     "support": {
         "issues": "https://github.com/timacdonald/callable-fake/issues",
         "source": "https://github.com/timacdonald/callable-fake/releases/latest",