diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f62c667..41832f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,29 +26,18 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache composer dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- - - name: Install - run: composer install --prefer-dist - - # —— QA ✔️‍️ ——————————————————————————————————————————————————————————————— - - name: Qualimetry - run: make qa + run: make install # —— Tests 🧪 ———————————————————————————————————————————————————————————— - name: Phpunit tests - run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover coverage.xml + run: make coverage env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + # —— QA ✔️‍️ ——————————————————————————————————————————————————————————————— + - name: Qualimetry + run: make qa + - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cc0197..3b50709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ CHANGELOG for 1.x - Changes config of phpcs, phpstan and phpunit - Comment base test because it doesn't work with the new `smartbooster/standard-bundle` implementation - Fix some style because of the new `smartbooster/standard-bundle` implementation +- Change action phpunit and qa order and use make, delete cache steps +- Add install.mk ## v1.5.0 - (2024-01-04) diff --git a/make/install.mk b/make/install.mk new file mode 100644 index 0000000..bc4b8b3 --- /dev/null +++ b/make/install.mk @@ -0,0 +1,8 @@ +## +## Installation and update +## ------- +.PHONY: install +install: ## Install the project + composer install + make cc + echo "Install complete !"