From a2f9af9c7426b4d7a71b5683d2e6b620d4242ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Fr=C3=B6mer?= Date: Mon, 6 Dec 2021 10:46:24 +0100 Subject: [PATCH 1/2] Add php8.1 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Frömer --- .docker/php7.4/Dockerfile | 3 ++- .docker/php8.0/Dockerfile | 3 ++- .docker/php8.1/Dockerfile | 12 ++++++++++++ .github/workflows/validate-code.yml | 22 ++++++++-------------- composer.json | 2 +- docker-compose.yml | 8 ++++++++ 6 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 .docker/php8.1/Dockerfile diff --git a/.docker/php7.4/Dockerfile b/.docker/php7.4/Dockerfile index 3d01cd0e..6052d3b8 100644 --- a/.docker/php7.4/Dockerfile +++ b/.docker/php7.4/Dockerfile @@ -1,6 +1,7 @@ FROM php:7.4-alpine -COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/ +ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/bin/ +RUN chmod +x /usr/bin/install-php-extensions RUN install-php-extensions ds xdebug opcache COPY --from=composer:latest /usr/bin/composer /usr/bin/composer diff --git a/.docker/php8.0/Dockerfile b/.docker/php8.0/Dockerfile index 80db0144..691dd4a1 100644 --- a/.docker/php8.0/Dockerfile +++ b/.docker/php8.0/Dockerfile @@ -1,6 +1,7 @@ FROM php:8.0-alpine -COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/ +ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/bin/ +RUN chmod +x /usr/bin/install-php-extensions RUN install-php-extensions ds xdebug opcache COPY --from=composer:latest /usr/bin/composer /usr/bin/composer diff --git a/.docker/php8.1/Dockerfile b/.docker/php8.1/Dockerfile new file mode 100644 index 00000000..b8133244 --- /dev/null +++ b/.docker/php8.1/Dockerfile @@ -0,0 +1,12 @@ +FROM php:8.1-alpine + +ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/bin/ +RUN chmod +x /usr/bin/install-php-extensions +RUN install-php-extensions ds xdebug opcache + +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer +ENV COMPOSER_ALLOW_SUPERUSER 1 + +WORKDIR /docker +# Workaround to keep container running +CMD ["tail", "-f", "/dev/null"] diff --git a/.github/workflows/validate-code.yml b/.github/workflows/validate-code.yml index 87aad02c..bf4801af 100644 --- a/.github/workflows/validate-code.yml +++ b/.github/workflows/validate-code.yml @@ -12,8 +12,8 @@ jobs: strategy: fail-fast: true matrix: - os: ["ubuntu-latest"] - php: ["7.4"] + os: [ "ubuntu-latest" ] + php: [ "7.4" ] steps: - name: Checkout uses: actions/checkout@v2.4.0 @@ -37,8 +37,8 @@ jobs: strategy: fail-fast: true matrix: - php: ["7.4"] - os: ["ubuntu-latest"] + php: [ "7.4" ] + os: [ "ubuntu-latest" ] steps: - name: Checkout uses: actions/checkout@v2.4.0 @@ -63,12 +63,9 @@ jobs: strategy: fail-fast: false matrix: - php: ["7.4", "8.0"] - os: ["ubuntu-latest"] - experimental: [false] - include: - - php: "8.0" - composer-options: "--ignore-platform-req=php" + php: [ "7.4", "8.0", "8.1" ] + os: [ "ubuntu-latest" ] + experimental: [ false ] steps: - name: Checkout @@ -93,11 +90,8 @@ jobs: strategy: fail-fast: false matrix: - php: [ "7.4", "8.0" ] + php: [ "7.4", "8.0", "8.1" ] os: [ "ubuntu-latest" ] - include: - - php: "8.0" - composer-options: "--ignore-platform-req=php" steps: - name: Checkout uses: actions/checkout@v2.4.0 diff --git a/composer.json b/composer.json index 4f96da40..8adf45b9 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": ">=7.3 || ^8.0", + "php": ">=7.3", "composer-plugin-api": "^2.0", "composer-unused/symbol-parser": "^0.1.3", "nikic/php-parser": "^4.13", diff --git a/docker-compose.yml b/docker-compose.yml index be252fc0..6019836b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,3 +16,11 @@ services: - .:/docker/composer-unused:rw - ../symbol-parser:/docker/symbol-parser:rw tty: true + + php8.1: + build: .docker/php8.1 + container_name: composer-unused-8.1 + volumes: + - .:/docker/composer-unused:rw + - ../symbol-parser:/docker/symbol-parser:rw + tty: true From 51c7e561821dabe8b0ba03b08a0d05fecd662172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Fr=C3=B6mer?= Date: Mon, 13 Dec 2021 22:54:29 +0100 Subject: [PATCH 2/2] Use proper php version constraint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Frömer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8adf45b9..0889ddfd 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": ">=7.3", + "php": "^7.3 || ^8.0", "composer-plugin-api": "^2.0", "composer-unused/symbol-parser": "^0.1.3", "nikic/php-parser": "^4.13",