diff --git a/.github/workflows/CI-Experimental.yml b/.github/workflows/CI-Experimental.yml index 4f29e57..3c7dc1d 100644 --- a/.github/workflows/CI-Experimental.yml +++ b/.github/workflows/CI-Experimental.yml @@ -10,7 +10,7 @@ on: jobs: tests: - name: Tests on PHP 8.5 nightly + name: Tests on PHP 8.6 nightly runs-on: ubuntu-24.04 services: valkey: @@ -24,7 +24,7 @@ jobs: persist-credentials: false - uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 with: - php-version: '8.5' + php-version: '8.6' extensions: mbstring, redis, apcu ini-values: apc.enable_cli=1, zend.assertions=1 coverage: none diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 165cda6..a88660f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,7 +21,7 @@ jobs: - 6379/tcp strategy: matrix: - php: ['8.2', '8.3', '8.4'] + php: ['8.2', '8.3', '8.4', '8.5'] dependencies: ['--ignore-platform-req=php', '--prefer-lowest --prefer-stable --ignore-platform-req=php'] steps: - name: Checkout @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - php: ['8.2', '8.3', '8.4'] + php: ['8.2', '8.3', '8.4', '8.5'] steps: - name: Checkout uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 diff --git a/composer.json b/composer.json index 3df31ee..c550aaa 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Prometheus instrumentation library", "license": "Apache-2.0", "require": { - "php": "~8.2.0|~8.3.0|~8.4.0", + "php": "~8.2.0|~8.3.0|~8.4.0|~8.5.0", "ext-json": "*", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", diff --git a/composer.lock b/composer.lock index ac1c263..7b0ccb6 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": "3e1a5407a854d8366d5d20bc35bc2243", + "content-hash": "cd8af9ba102060e8e1317cbc44b58ce5", "packages": [ { "name": "psr/http-client", @@ -7796,7 +7796,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.2.0|~8.3.0|~8.4.0", + "php": "~8.2.0|~8.3.0|~8.4.0|~8.5.0", "ext-json": "*" }, "platform-dev": {}, diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index fc7abad..849f22a 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1,8 +1,8 @@ ARG PHP_VERSION FROM php:${PHP_VERSION}-fpm -RUN pecl install redis-6.1.0 && \ - pecl install apcu-5.1.24 && \ +RUN pecl install redis-6.3.0 && \ + pecl install apcu-5.1.27 && \ docker-php-ext-enable redis apcu COPY www.conf /usr/local/etc/php-fpm.d/