From 9a92595b9e6cc4d30f8396af1f21763354fdac21 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Fri, 6 Oct 2023 07:33:10 +0100 Subject: [PATCH 1/9] Add PHP 8.3.0RC3 to build matrix --- .github/workflows/ci-build.yaml | 18 ++++++++++++------ package.xml | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index fef0f7a..80fd318 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -39,10 +39,11 @@ jobs: fail-fast: false matrix: os: [ windows-2019, windows-2022 ] - php: [ "8.2", "8.1", "8.0", "7.4", "7.3", "7.2", "7.1" ] + php: [ "8.3", "8.2", "8.1", "8.0", "7.4", "7.3", "7.2", "7.1" ] arch: [ x64, x86 ] ts: [ ts, nts ] exclude: + - { os: windows-2019, php: "8.3" } - { os: windows-2019, php: "8.2" } - { os: windows-2019, php: "8.1" } - { os: windows-2019, php: "8.0" } @@ -55,7 +56,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP SDK id: setup-php - uses: cmb69/setup-php-sdk@master + uses: cmb69/setup-php-sdk@v0.7 with: version: ${{matrix.php}} arch: ${{matrix.arch}} @@ -140,10 +141,12 @@ jobs: - 7.4.0 - 7.4.33 - 8.0.0 - - 8.0.26 + - 8.0.30 - 8.1.0 - - 8.1.13 + - 8.1.24 - 8.2.0 + - 8.2.11 + - 8.3.0RC3 zts-mode: - zts - nts @@ -160,7 +163,7 @@ jobs: - { os: ubuntu-22.04, php-version: 7.4.0 } - { os: ubuntu-22.04, php-version: 7.4.33 } - { os: ubuntu-22.04, php-version: 8.0.0 } - - { os: ubuntu-22.04, php-version: 8.0.26 } + - { os: ubuntu-22.04, php-version: 8.0.30 } steps: - name: "Purge built-in PHP version" run: | @@ -181,6 +184,9 @@ jobs: - name: "Set php-src download URL" run: echo "php_src_download_url=https://www.php.net/distributions/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV + - name: "PHP 8.3 RC URL override" + if: ${{ startsWith(matrix.php-version, '8.3.') }} + run: echo "php_src_download_url=https://downloads.php.net/~jakub/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV - name: "Install PHP ${{ matrix.php-version }} (${{ env.zts_flag}} ${{ matrix.php-options }})" run: | @@ -233,7 +239,7 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" steps: - uses: actions/checkout@v3 - name: Setup PHP with PECL extension diff --git a/package.xml b/package.xml index eb4cd2b..2ba13f6 100644 --- a/package.xml +++ b/package.xml @@ -104,7 +104,7 @@ 7.1.0 - 8.2.99 + 8.3.99 1.9.1 From 6198b20c5ffbeea61e90c4f54f7dbafee84a201e Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Wed, 18 Oct 2023 12:31:21 +0100 Subject: [PATCH 2/9] Test Windows builds using derickr/setup-php-sdk fork with PHP 8.3 support --- .github/workflows/ci-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 80fd318..e3c37ee 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP SDK id: setup-php - uses: cmb69/setup-php-sdk@v0.7 + uses: derickr/setup-php-sdk@php-83-setup with: version: ${{matrix.php}} arch: ${{matrix.arch}} From dc8f5f2c1306b7ca0981d277d85f4546824aa0c0 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Wed, 18 Oct 2023 12:35:02 +0100 Subject: [PATCH 3/9] Updated to use 8.3.0RC4 from GH release assets --- .github/workflows/ci-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index e3c37ee..7ddb2e6 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -146,7 +146,7 @@ jobs: - 8.1.24 - 8.2.0 - 8.2.11 - - 8.3.0RC3 + - 8.3.0RC4 zts-mode: - zts - nts @@ -186,7 +186,7 @@ jobs: run: echo "php_src_download_url=https://www.php.net/distributions/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV - name: "PHP 8.3 RC URL override" if: ${{ startsWith(matrix.php-version, '8.3.') }} - run: echo "php_src_download_url=https://downloads.php.net/~jakub/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV + run: echo "php_src_download_url=https://github.com/php/php-src/archive/refs/tags/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV - name: "Install PHP ${{ matrix.php-version }} (${{ env.zts_flag}} ${{ matrix.php-options }})" run: | From b556b02841359cf4f552cd15d26f20daf964884b Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Mon, 23 Oct 2023 20:35:29 +0100 Subject: [PATCH 4/9] Change extraction of php-src tgz to account for inconsistent paths in the tgz --- .github/workflows/ci-build.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 7ddb2e6..525ba88 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -192,11 +192,15 @@ jobs: run: | sudo DEBIAN_FRONTEND=noninteractive apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common build-essential autoconf libxml2-dev libsqlite3-dev libcurl4-openssl-dev - cd /tmp + mkdir -p /tmp/php + cd /tmp/php echo "Downloading release from ${{ env.php_src_download_url }} ..." - wget ${{ env.php_src_download_url }} - tar zxf php-${{ matrix.php-version }}.tar.gz - cd php-${{ matrix.php-version }} + wget -O php.tgz ${{ env.php_src_download_url }} + tar zxf php.tgz + rm php.tgz + ls -l + cd * + ls -l ./configure --with-pear --enable-debug --with-openssl ${{ env.zts_flag }} ${{ matrix.php-options }} make -j$(nproc) sudo make install From 03e175c5b4a101432e4c51b06a42e9570d447a3e Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Mon, 23 Oct 2023 21:27:04 +0100 Subject: [PATCH 5/9] Ensure buildconf is run before configure --- .github/workflows/ci-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 525ba88..c428da9 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -201,6 +201,7 @@ jobs: ls -l cd * ls -l + ./buildconf --force ./configure --with-pear --enable-debug --with-openssl ${{ env.zts_flag }} ${{ matrix.php-options }} make -j$(nproc) sudo make install From 9d412cf3d8f728f64adec3b5c7a26b119990040e Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Mon, 23 Oct 2023 21:48:22 +0100 Subject: [PATCH 6/9] Fix build issues for php-src --- .github/workflows/ci-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index c428da9..db32a36 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -191,7 +191,7 @@ jobs: - name: "Install PHP ${{ matrix.php-version }} (${{ env.zts_flag}} ${{ matrix.php-options }})" run: | sudo DEBIAN_FRONTEND=noninteractive apt-get update - sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common build-essential autoconf libxml2-dev libsqlite3-dev libcurl4-openssl-dev + sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common build-essential autoconf libxml2-dev libsqlite3-dev libcurl4-openssl-dev re2c mkdir -p /tmp/php cd /tmp/php echo "Downloading release from ${{ env.php_src_download_url }} ..." From 59452967495903dbee370841cb3d3b32af38a71f Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Mon, 30 Oct 2023 09:26:18 +0000 Subject: [PATCH 7/9] Updated to build on PHP 8.3.0RC5 --- .github/workflows/ci-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index db32a36..46cab2f 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -146,7 +146,7 @@ jobs: - 8.1.24 - 8.2.0 - 8.2.11 - - 8.3.0RC4 + - 8.3.0RC5 zts-mode: - zts - nts From c4cc0b1d4110141101da4f1fa6fd6b2828572eb7 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Fri, 1 Dec 2023 19:53:15 +0000 Subject: [PATCH 8/9] Use PHP 8.3 final release in builds --- .github/workflows/ci-build.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 46cab2f..979acd8 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP SDK id: setup-php - uses: derickr/setup-php-sdk@php-83-setup + uses: php/setup-php-sdk@v0.8 with: version: ${{matrix.php}} arch: ${{matrix.arch}} @@ -146,7 +146,7 @@ jobs: - 8.1.24 - 8.2.0 - 8.2.11 - - 8.3.0RC5 + - 8.3.0 zts-mode: - zts - nts @@ -184,9 +184,6 @@ jobs: - name: "Set php-src download URL" run: echo "php_src_download_url=https://www.php.net/distributions/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV - - name: "PHP 8.3 RC URL override" - if: ${{ startsWith(matrix.php-version, '8.3.') }} - run: echo "php_src_download_url=https://github.com/php/php-src/archive/refs/tags/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV - name: "Install PHP ${{ matrix.php-version }} (${{ env.zts_flag}} ${{ matrix.php-options }})" run: | From d92362875e4e53419b4957ec9b4d77fb48411127 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Fri, 1 Dec 2023 19:58:55 +0000 Subject: [PATCH 9/9] Updated version and package.xml for 1.10.0 release --- package.xml | 28 +++++++++++++++++++++++----- zend_scoutapm.h | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/package.xml b/package.xml index 2ba13f6..49af9b3 100644 --- a/package.xml +++ b/package.xml @@ -25,11 +25,11 @@ - 2022-12-14 - + 2023-12-01 + - 1.9.1 - 1.9.1 + 1.10.0 + 1.10.0 stable @@ -37,7 +37,9 @@ MIT - - Fix missing PHP 8.2 assets for Windows (#130) + - Add support for PHP 8.3 (#135) + - Fix CI build matrix (#137) + - Add help for installing the ext in a Dockerfile (#136) @@ -115,6 +117,22 @@ + + 2022-12-14 + + + 1.9.1 + 1.9.1 + + + stable + stable + + MIT + + - Fix missing PHP 8.2 assets for Windows (#130) + + 2022-12-09 diff --git a/zend_scoutapm.h b/zend_scoutapm.h index 2dcb2a7..bafde08 100644 --- a/zend_scoutapm.h +++ b/zend_scoutapm.h @@ -23,7 +23,7 @@ #include "scout_execute_ex.h" #define PHP_SCOUTAPM_NAME "scoutapm" -#define PHP_SCOUTAPM_VERSION "1.9.1" +#define PHP_SCOUTAPM_VERSION "1.10.0" /* Extreme amounts of debugging, set to 1 to enable it and `make clean && make` (tests will fail...) */ #define SCOUT_APM_EXT_DEBUGGING 0