From 9eb8ff0b2061f4a4336c6c862baf4ad9cad6d961 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 5 Sep 2021 19:44:34 +0100 Subject: [PATCH 1/4] Support PHP 8.1 --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++-- .github/workflows/integration.yml | 2 +- .travis.yml | 6 ++---- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da7414e5..03739193 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,38 @@ on: pull_request: jobs: + build-lowest-version: + name: Build lowest version + runs-on: ubuntu-latest + strategy: + max-parallel: 10 + matrix: + php: ['5.5', '7.2'] + + steps: + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + coverage: 'none' + extensions: mbstring + + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install dependencies + run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress + + - name: Run tests + run: make test + build: name: Build runs-on: ubuntu-latest strategy: max-parallel: 10 matrix: - php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4'] + php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] steps: - name: Set up PHP @@ -24,7 +49,11 @@ jobs: uses: actions/checkout@v2 - name: Install dependencies - run: composer update --no-interaction --no-progress --prefer-dist + run: composer update --no-interaction --no-progress + + - name: Mimic PHP 8.0 + run: composer config platform.php 8.0.999 + if: matrix.php > 8 - name: Run tests run: make test diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index b6e0eb24..3c31f9ef 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -26,7 +26,7 @@ jobs: - name: Download dependencies uses: ramsey/composer-install@v1 with: - composer-options: --no-interaction --prefer-dist --optimize-autoloader + composer-options: --no-interaction --optimize-autoloader - name: Start server run: php -S 127.0.0.1:10002 tests/Integration/server.php & diff --git a/.travis.yml b/.travis.yml index a3219eba..77d260ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ matrix: - php: 5.5.9 dist: trusty env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" - - php: 5.5 - dist: trusty fast_finish: true before_install: @@ -21,8 +19,8 @@ before_install: - if [[ "$TRAVIS_PHP_VERSION" == "hhvm-3.24" ]]; then travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n; fi install: - - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]]; then travis_retry composer update --prefer-dist; fi - - if [[ "$TRAVIS_PHP_VERSION" == "nightly" ]]; then travis_retry composer update --prefer-dist --ignore-platform-reqs; fi + - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]]; then travis_retry composer update; fi + - if [[ "$TRAVIS_PHP_VERSION" == "nightly" ]]; then travis_retry composer update --ignore-platform-reqs; fi script: - make test From ac582d726260200d1b6f77f14b1cb26eef77b28b Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 5 Sep 2021 19:51:19 +0100 Subject: [PATCH 2/4] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03739193..e61860d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,12 +48,12 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install dependencies - run: composer update --no-interaction --no-progress - - name: Mimic PHP 8.0 run: composer config platform.php 8.0.999 if: matrix.php > 8 + - name: Install dependencies + run: composer update --no-interaction --no-progress + - name: Run tests run: make test From 40b4d0204cf15716ae2b2e3cfec812f01f864094 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 5 Sep 2021 19:59:01 +0100 Subject: [PATCH 3/4] Update ci.yml --- .github/workflows/ci.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e61860d5..eda7dceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,31 +4,6 @@ on: pull_request: jobs: - build-lowest-version: - name: Build lowest version - runs-on: ubuntu-latest - strategy: - max-parallel: 10 - matrix: - php: ['5.5', '7.2'] - - steps: - - name: Set up PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: 'none' - extensions: mbstring - - - name: Checkout code - uses: actions/checkout@v2 - - - name: Install dependencies - run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress - - - name: Run tests - run: make test - build: name: Build runs-on: ubuntu-latest From 4da8d90c5d5d7c8b6d046569db71ecc625d57acc Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 5 Sep 2021 19:59:08 +0100 Subject: [PATCH 4/4] Delete bc.yml --- .github/workflows/bc.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/bc.yml diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml deleted file mode 100644 index 9eaedbce..00000000 --- a/.github/workflows/bc.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: BC Check - -on: - pull_request: - -jobs: - roave-bc-check: - name: Roave BC Check - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Roave BC Check - uses: docker://nyholm/roave-bc-check-ga