diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d81528c..18332b5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ on: jobs: latest: name: PHP ${{ matrix.php }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -23,15 +23,14 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - tools: composer:v2 coverage: none - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Update dependencies for PHP 8 if: matrix.php >= '8.0' run: composer update --prefer-dist --no-interaction --no-progress --no-ansi - - name: Execute 7 tests + - name: Execute tests run: make phpcs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff116dc..aecf1af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -17,7 +17,7 @@ jobs: ini-values: phar.readonly=0 - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Determine version name id: get-version diff --git a/CHANGELOG.md b/CHANGELOG.md index 677779c..6b279c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========= +1.2.0 +----- + +* Drop support for PHP 7. We no longer + 1.1.0 ----- diff --git a/Makefile b/Makefile index 7277349..f42475c 100644 --- a/Makefile +++ b/Makefile @@ -17,17 +17,18 @@ tools/box: chmod +x tools/box tools/php-cs-fixer: - wget --directory-prefix=tools --quiet https://cs.symfony.com/download/php-cs-fixer-v3.phar - mv tools/php-cs-fixer-v3.phar tools/php-cs-fixer + wget --directory-prefix=tools --quiet https://github.com/php-cs-fixer/php-cs-fixer/releases/download/v3.41.1/php-cs-fixer.phar + mv tools/php-cs-fixer.phar tools/php-cs-fixer chmod +x tools/php-cs-fixer tools/phpstan: - wget --directory-prefix=tools --quiet https://github.com/phpstan/phpstan/releases/download/1.8.5/phpstan.phar + wget --directory-prefix=tools --quiet https://github.com/phpstan/phpstan/releases/download/1.10.50/phpstan.phar mv tools/phpstan.phar tools/phpstan chmod +x tools/phpstan -phpcs: vendor tools/php-cs-fixer tools/phpstan +phpcs: vendor tools/box tools/php-cs-fixer tools/phpstan composer validate --strict --no-check-lock + tools/box validate tools/php-cs-fixer fix --dry-run --stop-on-violation -v tools/phpstan analyze --level=7 --no-progress bin/ src/ diff --git a/README.md b/README.md index ac51f9e..14ef26c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Download latest release](https://img.shields.io/github/tag/liip/varnish-plus-cli.svg?label=release)](https://github.com/liip/varnish-plus-cli/releases/latest/download/varnish-plus-cli.phar) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE) -[![Build Status](https://api.travis-ci.org/liip/varnish-plus-cli.svg?branch=master)](https://travis-ci.org/liip/varnish-plus-cli) +[![CI](https://github.com/liip/varnish-plus-cli/actions/workflows/ci.yaml/badge.svg)](https://github.com/liip/varnish-plus-cli/actions/workflows/ci.yaml) This self-contained phar (PHP archive) can be used to work with the Varnish Admin Console VAC. @@ -81,7 +81,7 @@ $(DIST_DIR)/%.maintenance.vcl: $(TEMPLATE_FILES) $(BIN_DIR)/varnish-plus-cli.phar vcl:twig:compile --twig-variable maintenance=true $(TEMPLATE_DIR) envs/$*.vcl.twig $@ # this assumes that there's the following directory layout: -# +# # . # ├── Makefile # ├── templates