diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dde8e9a..d7752c3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,5 +77,8 @@ jobs: restore-keys: | ${{ runner.os }}-php-${{ matrix.php-version }}- + - name: Run make + run: make + - name: Run tests with phpunit run: ./run-tests.sh diff --git a/.gitignore b/.gitignore index 97b7377d..92834d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,10 @@ .idea/ -# Smarty -lexer/*.php -lexer/*.php.bak -lexer/*.out - -# Dev phpunit* .phpunit.result.cache -vendor/* -composer.lock +/vendor/* +/composer.lock /src/Lexer/ConfigfileLexer.php /src/Lexer/TemplateLexer.php /src/Parser/ConfigfileParser.php diff --git a/composer.json b/composer.json index 3e9eb62f..6ace02b6 100644 --- a/composer.json +++ b/composer.json @@ -43,17 +43,11 @@ }, "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "require-dev": { "phpunit/phpunit": "^8.5 || ^7.5", - "smarty/smarty-lexer": "@dev" - }, - "repositories": [ - { - "type": "path", - "url": "../smarty-lexer/" - } - ] + "smarty/smarty-lexer": "^4.0" + } }