From a671d555cb3fd1d8a55352a2ba08e3cfb17e6550 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 18 Apr 2023 23:22:48 +0200 Subject: [PATCH 1/2] Update to roadrunner 2023 --- Dockerfile | 2 +- build.sh | 2 +- composer.json | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5116c57e..c52ec93a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ COPY --from=composer:2 /usr/bin/composer ./composer.phar RUN apk add --no-cache git && \ php composer.phar install --no-dev --prefer-dist --optimize-autoloader --no-progress --no-interaction && \ if [ "$SHLINK_RUNTIME" == 'openswoole' ]; then \ - php composer.phar remove spiral/roadrunner spiral/roadrunner-jobs --with-all-dependencies --update-no-dev --optimize-autoloader --no-progress --no-interactionc ; \ + php composer.phar remove spiral/roadrunner spiral/roadrunner-jobs spiral/roadrunner-cli spiral/roadrunner-http --with-all-dependencies --update-no-dev --optimize-autoloader --no-progress --no-interactionc ; \ elif [ $SHLINK_RUNTIME == 'rr' ]; then \ php composer.phar remove mezzio/mezzio-swoole --with-all-dependencies --update-no-dev --optimize-autoloader --no-progress --no-interaction ; \ fi; \ diff --git a/build.sh b/build.sh index d9cda64d..43b240a2 100755 --- a/build.sh +++ b/build.sh @@ -39,7 +39,7 @@ if [[ $noSwoole ]]; then ${composerBin} remove mezzio/mezzio-swoole --with-all-dependencies --update-no-dev $composerFlags else # If generating a dist for openswoole, uninstall RoadRunner - ${composerBin} remove spiral/roadrunner spiral/roadrunner-jobs --with-all-dependencies --update-no-dev $composerFlags + ${composerBin} remove spiral/roadrunner spiral/roadrunner-jobs spiral/roadrunner-cli spiral/roadrunner-http --with-all-dependencies --update-no-dev $composerFlags fi # Delete development files diff --git a/composer.json b/composer.json index d5ac6410..826f4896 100644 --- a/composer.json +++ b/composer.json @@ -47,13 +47,15 @@ "ramsey/uuid": "^4.7", "shlinkio/shlink-common": "dev-main#9eecf8c as 5.5", "shlinkio/shlink-config": "^2.4", - "shlinkio/shlink-event-dispatcher": "^2.6", + "shlinkio/shlink-event-dispatcher": "dev-main#8c677ae as 3.0", "shlinkio/shlink-importer": "dev-main#6b63b12 as 5.1", "shlinkio/shlink-installer": "^8.3", "shlinkio/shlink-ip-geolocation": "^3.2", "shlinkio/shlink-json": "^1.0", - "spiral/roadrunner": "^2.12", - "spiral/roadrunner-jobs": "^2.7", + "spiral/roadrunner": "^2023.1", + "spiral/roadrunner-cli": "^2.4", + "spiral/roadrunner-http": "^3.0", + "spiral/roadrunner-jobs": "^4.0", "symfony/console": "^6.2", "symfony/filesystem": "^6.2", "symfony/lock": "^6.2", From e652166289553944a912b627c0a261bb9de2ff4c Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 18 Apr 2023 23:24:21 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b51d9c8b..f9ca10a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this * [#1656](https://github.com/shlinkio/shlink/issues/1656) Add support for openswoole 22 ### Changed -* *Nothing* +* [#1755](https://github.com/shlinkio/shlink/issues/1755) Update to roadrunner 2023 ### Deprecated * *Nothing*