From 9c05e37fbefaac073909453172301125c8df2838 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 16:53:43 +0100 Subject: [PATCH 1/4] Bump phpstan/phpstan from 0.12.85 to 0.12.86 (#4212) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 0.12.85 to 0.12.86. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/0.12.85...0.12.86) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index b6db48b2f..729da7bb5 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "pocketmine/spl": "^0.4.0" }, "require-dev": { - "phpstan/phpstan": "0.12.85", + "phpstan/phpstan": "0.12.86", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index 6f3056e85..7e49ef798 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b03f33fc3d7e3ee6df116bd1e0b5b79e", + "content-hash": "5ac1880e8baccba851c0a4b8ea620e90", "packages": [ { "name": "adhocore/json-comment", @@ -1009,16 +1009,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.85", + "version": "0.12.86", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03" + "reference": "a84fdc53ecca7643dbc89ef8880d8b393a6c155a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/20e6333c0067875ad7697cd8acdf245c6ef69d03", - "reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a84fdc53ecca7643dbc89ef8880d8b393a6c155a", + "reference": "a84fdc53ecca7643dbc89ef8880d8b393a6c155a", "shasum": "" }, "require": { @@ -1049,7 +1049,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.85" + "source": "https://github.com/phpstan/phpstan/tree/0.12.86" }, "funding": [ { @@ -1065,7 +1065,7 @@ "type": "tidelift" } ], - "time": "2021-04-27T14:13:16+00:00" + "time": "2021-05-08T11:29:01+00:00" }, { "name": "phpstan/phpstan-phpunit", From 5116e11ceaad47d1d058779167a39bd37bc2cd39 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 May 2021 17:51:18 +0100 Subject: [PATCH 2/4] Only install the stuff we need to run PHP, not to build it --- .github/workflows/main.yml | 8 ++++---- tests/gh-actions/install-dependencies.sh | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100755 tests/gh-actions/install-dependencies.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ff1cad46..ad5304ace 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: - name: Install cached PHP's dependencies if: steps.php-build-cache.outputs.cache-hit == 'true' - run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + run: ./tests/gh-actions/install-dependencies.sh - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH @@ -105,7 +105,7 @@ jobs: - name: Install cached PHP's dependencies if: steps.php-build-cache.outputs.cache-hit == 'true' - run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + run: ./tests/gh-actions/install-dependencies.sh - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH @@ -157,7 +157,7 @@ jobs: - name: Install cached PHP's dependencies if: steps.php-build-cache.outputs.cache-hit == 'true' - run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + run: ./tests/gh-actions/install-dependencies.sh - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH @@ -209,7 +209,7 @@ jobs: - name: Install cached PHP's dependencies if: steps.php-build-cache.outputs.cache-hit == 'true' - run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + run: ./tests/gh-actions/install-dependencies.sh - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH diff --git a/tests/gh-actions/install-dependencies.sh b/tests/gh-actions/install-dependencies.sh new file mode 100755 index 000000000..368e27e3a --- /dev/null +++ b/tests/gh-actions/install-dependencies.sh @@ -0,0 +1,3 @@ +#!/bin/bash +sudo apt update && sudo apt install -y \ + libzip5 From e648f1c91ef82bdfee56b6d7225819b3d5fd78b2 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 May 2021 17:55:27 +0100 Subject: [PATCH 3/4] Remove unnecessary script copy --- tests/gh-actions/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/gh-actions/build.sh b/tests/gh-actions/build.sh index c80d5a739..62f1082cf 100755 --- a/tests/gh-actions/build.sh +++ b/tests/gh-actions/build.sh @@ -23,4 +23,3 @@ cd php-build echo '"pthreads",,"https://github.com/pmmp/pthreads.git",,,"extension",' >> share/php-build/extension/definition PHP_BUILD_INSTALL_EXTENSION='pthreads=@acc6e52b2144c61c434b62a3cb680d537e06828e yaml=2.2.1' PHP_BUILD_ZTS_ENABLE=on ./bin/php-build "$VERSION" "$INSTALL_DIR" || exit 1 rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true -cp install-dependencies.sh "$INSTALL_DIR" From 5a7736b17929f2e1683f41cd824cd54b44eeecde Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 10 May 2021 20:30:08 +0100 Subject: [PATCH 4/4] actions: go with PHP 7.4.19 --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad5304ace..0df70f05d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.18] + php: [7.3.28, 7.4.19] steps: - uses: actions/checkout@v2 #needed for build.sh @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.18] + php: [7.3.28, 7.4.19] steps: - uses: actions/checkout@v2 @@ -87,7 +87,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.18] + php: [7.3.28, 7.4.19] steps: - uses: actions/checkout@v2 @@ -137,7 +137,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.18] + php: [7.3.28, 7.4.19] steps: - uses: actions/checkout@v2 @@ -189,7 +189,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.18] + php: [7.3.28, 7.4.19] steps: - uses: actions/checkout@v2