From 14c68b4bbee6874bb6408a42b9b04ef6074b80c4 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Wed, 8 Nov 2023 18:51:03 +0100 Subject: [PATCH] Update native deps for PHP 8.3 preparation --- .github/workflows/ci-db-tests.yml | 2 +- .github/workflows/ci-mutation-tests.yml | 2 +- .github/workflows/ci-tests.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/publish-release.yml | 7 +------ .github/workflows/publish-swagger-spec.yml | 2 +- Dockerfile | 4 ++-- build.sh | 3 ++- composer.json | 2 +- data/infra/php.Dockerfile | 2 +- data/infra/roadrunner.Dockerfile | 2 +- data/infra/swoole.Dockerfile | 4 ++-- 12 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-db-tests.yml b/.github/workflows/ci-db-tests.yml index c2bfe8d9..f164e7da 100644 --- a/.github/workflows/ci-db-tests.yml +++ b/.github/workflows/ci-db-tests.yml @@ -28,7 +28,7 @@ jobs: - uses: './.github/actions/ci-setup' with: php-version: ${{ matrix.php-version }} - php-extensions: openswoole-22.0.0, pdo_sqlsrv-5.10.1 + php-extensions: openswoole-22.1.0, pdo_sqlsrv-5.11.1 extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }} - name: Create test database if: ${{ inputs.platform == 'ms' }} diff --git a/.github/workflows/ci-mutation-tests.yml b/.github/workflows/ci-mutation-tests.yml index 7ee91941..6bc69eb3 100644 --- a/.github/workflows/ci-mutation-tests.yml +++ b/.github/workflows/ci-mutation-tests.yml @@ -20,7 +20,7 @@ jobs: - uses: './.github/actions/ci-setup' with: php-version: ${{ matrix.php-version }} - php-extensions: openswoole-22.0.0 + php-extensions: openswoole-22.1.0 extensions-cache-key: mutation-tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} - uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d606e252..62b7ca2e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -26,7 +26,7 @@ jobs: - uses: './.github/actions/ci-setup' with: php-version: ${{ matrix.php-version }} - php-extensions: openswoole-22.0.0 + php-extensions: openswoole-22.1.0 extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} - run: composer test:${{ inputs.test-group }}:ci - uses: actions/upload-artifact@v3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3953aeec..37134b81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - uses: './.github/actions/ci-setup' with: php-version: ${{ matrix.php-version }} - php-extensions: openswoole-22.0.0 + php-extensions: openswoole-22.1.0 extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ matrix.command }} - run: composer ${{ matrix.command }} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index be34a9a1..625597a1 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -12,17 +12,12 @@ jobs: matrix: php-version: ['8.2', '8.3'] swoole: ['yes', 'no'] - exclude: - # Openswoole does not support PHP 8.3, so lets not build for that combination - # Next Shlink version (4.0.0) is completely dropping support for openswoole and we will be able to remove this - - php-version: '8.3' - swoole: 'yes' steps: - uses: actions/checkout@v4 - uses: './.github/actions/ci-setup' with: php-version: ${{ matrix.php-version }} - php-extensions: openswoole-22.0.0 + php-extensions: openswoole-22.1.0 extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }} install-deps: 'no' - if: ${{ matrix.swoole == 'yes' }} diff --git a/.github/workflows/publish-swagger-spec.yml b/.github/workflows/publish-swagger-spec.yml index b18eda20..2ecf8d49 100644 --- a/.github/workflows/publish-swagger-spec.yml +++ b/.github/workflows/publish-swagger-spec.yml @@ -20,7 +20,7 @@ jobs: - uses: './.github/actions/ci-setup' with: php-version: ${{ matrix.php-version }} - php-extensions: openswoole-22.0.0 + php-extensions: openswoole-22.1.0 extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }} - run: composer swagger:inline - run: mkdir ${{ steps.determine_version.outputs.version }} diff --git a/Dockerfile b/Dockerfile index 8c5a9486..0916b10b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ ENV SHLINK_RUNTIME ${SHLINK_RUNTIME} ARG SHLINK_USER_ID='root' ENV SHLINK_USER_ID ${SHLINK_USER_ID} -ENV OPENSWOOLE_VERSION 22.0.0 -ENV PDO_SQLSRV_VERSION 5.10.1 +ENV OPENSWOOLE_VERSION 22.1.0 +ENV PDO_SQLSRV_VERSION 5.11.1 ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV LC_ALL 'C' diff --git a/build.sh b/build.sh index f91ab408..db607172 100755 --- a/build.sh +++ b/build.sh @@ -31,7 +31,8 @@ cd "${builtContent}" # Install dependencies echo "Installing dependencies with $composerBin..." -composerFlags="--optimize-autoloader --no-progress --no-interaction" +# Deprecated. Do not ignore PHP platform req for Shlink v4.0.0 +composerFlags="--optimize-autoloader --no-progress --no-interaction --ignore-platform-req=php+" ${composerBin} self-update ${composerBin} install --no-dev --prefer-dist $composerFlags diff --git a/composer.json b/composer.json index 8e42b1d0..4f036a17 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "lstrojny/functional-php": "^1.17", "mezzio/mezzio": "^3.17", "mezzio/mezzio-fastroute": "^3.10", - "mezzio/mezzio-problem-details": "^1.12", + "mezzio/mezzio-problem-details": "^1.13", "mezzio/mezzio-swoole": "^4.7", "mlocati/ip-lib": "^1.18", "mobiledetect/mobiledetectlib": "^3.74", diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index 90ccab23..14c99f95 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -2,7 +2,7 @@ FROM php:8.2-fpm-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 -ENV PDO_SQLSRV_VERSION 5.10.1 +ENV PDO_SQLSRV_VERSION 5.11.1 ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 diff --git a/data/infra/roadrunner.Dockerfile b/data/infra/roadrunner.Dockerfile index 457a416f..0e91d491 100644 --- a/data/infra/roadrunner.Dockerfile +++ b/data/infra/roadrunner.Dockerfile @@ -2,7 +2,7 @@ FROM php:8.2-alpine3.17 MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 -ENV PDO_SQLSRV_VERSION 5.10.1 +ENV PDO_SQLSRV_VERSION 5.11.1 ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 42c27b14..72536c75 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -3,8 +3,8 @@ MAINTAINER Alejandro Celaya ENV APCU_VERSION 5.1.21 ENV INOTIFY_VERSION 3.0.0 -ENV OPENSWOOLE_VERSION 22.0.0 -ENV PDO_SQLSRV_VERSION 5.10.1 +ENV OPENSWOOLE_VERSION 22.1.0 +ENV PDO_SQLSRV_VERSION 5.11.1 ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_SQL_VERSION 18_18.1.1.1