diff --git a/.github/workflows/CI-Experimental.yml b/.github/workflows/CI-Experimental.yml index a18eb13d..7ab0a603 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.1 nightly + name: Tests on PHP 8.2 nightly runs-on: ubuntu-20.04 services: redis: @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v2.4.0 - uses: shivammathur/setup-php@2.15.0 with: - php-version: '8.1' + php-version: '8.2' 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 c9d24e61..69f2c751 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,7 +19,7 @@ jobs: - 6379/tcp strategy: matrix: - php: ['8.0'] + php: ['8.0', '8.1'] dependencies: ['', '--prefer-lowest --prefer-stable'] steps: - name: Checkout @@ -78,7 +78,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - php: [ '8.0' ] + php: ['8.0', '8.1-rc-fpm'] steps: - name: Checkout uses: actions/checkout@v2.4.0 diff --git a/composer.json b/composer.json index 83f16bc9..2d83839e 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Prometheus instrumentation library", "license": "Apache-2.0", "require": { - "php": "~8.0.0", + "php": "~8.0.0|~8.1.0", "ext-json": "*", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", diff --git a/composer.lock b/composer.lock index c89cc321..86cae8c4 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": "dada407cba14de71a7f8fded958ce1e9", + "content-hash": "6915e87100dc1be7a795b228df7bf7e5", "packages": [ { "name": "psr/http-client", @@ -4602,6 +4602,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { @@ -6377,7 +6378,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0", + "php": "~8.0.0|~8.1.0", "ext-json": "*" }, "platform-dev": [], diff --git a/docker-compose.yml b/docker-compose.yml index 73651576..cd41ef96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: build: context: php-fpm/ args: - PHP_VERSION: ${PHP_VERSION:-7.3} + PHP_VERSION: ${PHP_VERSION:-8.0} volumes: - .:/var/www/html environment: @@ -26,7 +26,7 @@ services: build: context: php-fpm/ args: - PHP_VERSION: ${PHP_VERSION:-7.3} + PHP_VERSION: ${PHP_VERSION:-8.0} volumes: - .:/var/www/html environment: diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index f102f72c..ff9d37ea 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-5.3.2 && \ - pecl install apcu-5.1.19 && \ +RUN pecl install redis-5.3.4 && \ + pecl install apcu-5.1.21 && \ docker-php-ext-enable redis apcu COPY www.conf /usr/local/etc/php-fpm.d/