github actions: improve install cache

cebe · cebe · commit 1f7504aeacaa · 2020-12-15T22:02:32.000+01:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -56,13 +56,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
-          key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            php${{ matrix.php }}-composer-
+          key: php${{ matrix.php }}-os${{ matrix.os }}-yaml${{ matrix.yaml }}-composer-${{ hashFiles('**/composer.json') }}
 
 
       - name: Validate composer.json and composer.lock
-        run: composer validate
+        run: composer validate --ansi
 
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
diff --git a/Makefile b/Makefile
@@ -17,11 +17,11 @@ fix-style:
 	vendor/bin/php-cs-fixer fix src/ --diff
 
 install:
-	composer install --prefer-dist --no-interaction --no-progress --no-suggest
+	composer install --prefer-dist --no-interaction --no-progress --no-suggest --ansi
 	yarn install
 
 test:
-	php $(PHPARGS) $(XPHPARGS) vendor/bin/phpunit --verbose $(TESTCASE)
+	php $(PHPARGS) $(XPHPARGS) vendor/bin/phpunit --verbose --color $(TESTCASE)
 	php $(PHPARGS) $(XPHPARGS) bin/php-openapi validate tests/spec/data/recursion.json
 	php $(PHPARGS) $(XPHPARGS) bin/php-openapi validate tests/spec/data/recursion2.yaml
 
