From d5b7bf77b0265fc8223bd815514c7baca997afad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 09:44:19 +0000 Subject: [PATCH 1/3] Bump build/php from `6b605ed` to `b479ec4` (#5521) Bumps [build/php](https://github.com/pmmp/php-build-scripts) from `6b605ed` to `b479ec4`. - [Release notes](https://github.com/pmmp/php-build-scripts/releases) - [Commits](https://github.com/pmmp/php-build-scripts/compare/6b605ed7c458fc8f95080ffe41a7f248a7160107...b479ec438f05459eac959f4952152527bbc7ce0b) --- updated-dependencies: - dependency-name: build/php dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index 6b605ed7c..b479ec438 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit 6b605ed7c458fc8f95080ffe41a7f248a7160107 +Subproject commit b479ec438f05459eac959f4952152527bbc7ce0b From f948cb0086e71d1dfa0b16cfbe0e50fbcbd4fc75 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 21 Jan 2023 15:30:36 +0000 Subject: [PATCH 2/3] PocketMine.php: refuse pthreads 5.0 --- src/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PocketMine.php b/src/PocketMine.php index f49115826..4b0b644ec 100644 --- a/src/PocketMine.php +++ b/src/PocketMine.php @@ -122,7 +122,7 @@ namespace pocketmine { if(substr_count($pthreads_version, ".") < 2){ $pthreads_version = "0.$pthreads_version"; } - if(version_compare($pthreads_version, "4.0.0") < 0 || version_compare($pthreads_version, "5.0.0") > 0){ + if(version_compare($pthreads_version, "4.0.0") < 0 || version_compare($pthreads_version, "5.0.0") >= 0){ $messages[] = "pthreads ^4.0.0 is required, while you have $pthreads_version."; } } From a12aac71fd3534fbfa12fec710b72f73c7053742 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 23 Jan 2023 19:36:52 +0000 Subject: [PATCH 3/3] Updated setup-php-action --- .github/workflows/main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2aca2934e..913a575f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,10 +17,11 @@ jobs: steps: - name: Build and prepare PHP cache - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" phpstan: name: PHPStan analysis @@ -37,10 +38,11 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php @@ -75,10 +77,11 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php @@ -115,10 +118,11 @@ jobs: submodules: true - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php @@ -153,10 +157,11 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php