From 2581f8999397a7b5b44a2354479c92e09d8b9240 Mon Sep 17 00:00:00 2001 From: auooru Date: Fri, 27 Oct 2023 14:12:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Update:=20=E6=B8=85=E7=90=86=E5=86=97?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=BC=80=E5=8F=91=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Components/amqp/composer.json | 6 ------ src/Components/apidoc/composer.json | 6 ------ src/Components/kafka/composer.json | 6 ------ src/Components/mqtt/composer.json | 6 ------ src/Components/queue/composer.json | 6 ------ 5 files changed, 30 deletions(-) diff --git a/src/Components/amqp/composer.json b/src/Components/amqp/composer.json index 3cab49ed37..1f9077cdf4 100644 --- a/src/Components/amqp/composer.json +++ b/src/Components/amqp/composer.json @@ -8,7 +8,6 @@ "php-amqplib/php-amqplib": "^3.5" }, "require-dev": { - "yurunsoft/ide-helper": "~1.0", "swoole/ide-helper": "~5.0" }, "autoload": { @@ -36,11 +35,6 @@ "post-update-cmd": "Imi\\AMQP\\Dev\\Dev::postUpdate" }, "extra": { - "ide-helper": { - "list": [ - "redis" - ] - } }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/src/Components/apidoc/composer.json b/src/Components/apidoc/composer.json index ed614e4d85..d61c7946a3 100644 --- a/src/Components/apidoc/composer.json +++ b/src/Components/apidoc/composer.json @@ -8,7 +8,6 @@ "doctrine/annotations": "^1.7" }, "require-dev": { - "yurunsoft/ide-helper": "~1.0", "swoole/ide-helper": "~5.0" }, "autoload": { @@ -28,11 +27,6 @@ }, "scripts": {}, "extra": { - "ide-helper": { - "list": [ - "redis" - ] - } }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/src/Components/kafka/composer.json b/src/Components/kafka/composer.json index 14cd970760..7127ed6815 100644 --- a/src/Components/kafka/composer.json +++ b/src/Components/kafka/composer.json @@ -8,7 +8,6 @@ "longlang/phpkafka": "^1.1" }, "require-dev": { - "yurunsoft/ide-helper": "~1.0", "swoole/ide-helper": "~5.0" }, "autoload": { @@ -36,11 +35,6 @@ "post-update-cmd": "Imi\\Kafka\\Dev\\Dev::postUpdate" }, "extra": { - "ide-helper": { - "list": [ - "redis" - ] - } }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/src/Components/mqtt/composer.json b/src/Components/mqtt/composer.json index 78d421f95b..eaa001a5d8 100644 --- a/src/Components/mqtt/composer.json +++ b/src/Components/mqtt/composer.json @@ -7,7 +7,6 @@ "binsoul/net-mqtt": "^0.8.0" }, "require-dev": { - "yurunsoft/ide-helper": "~1.0", "swoole/ide-helper": "~5.0" }, "autoload": { @@ -34,11 +33,6 @@ "post-update-cmd": "Imi\\MQTT\\Dev\\Dev::postUpdate" }, "extra": { - "ide-helper": { - "list": [ - "redis" - ] - } }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/src/Components/queue/composer.json b/src/Components/queue/composer.json index 1912216dfe..adb5c6333e 100644 --- a/src/Components/queue/composer.json +++ b/src/Components/queue/composer.json @@ -5,7 +5,6 @@ "description": "imi 框架的队列组件，使用 Redis 作为持久化", "require": {}, "require-dev": { - "yurunsoft/ide-helper": "~1.0", "swoole/ide-helper": "~5.0" }, "autoload": { @@ -32,11 +31,6 @@ "post-update-cmd": "Imi\\Queue\\Dev\\Dev::postUpdate" }, "extra": { - "ide-helper": { - "list": [ - "redis" - ] - } }, "minimum-stability": "dev", "prefer-stable": true, From 97d37a0b8a0e841f92e2b91f6ff6ce961e2ed6d0 Mon Sep 17 00:00:00 2001 From: auooru Date: Fri, 27 Oct 2023 14:17:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Update:=20=E6=B8=85=E7=90=86=E5=86=97?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=BC=80=E5=8F=91=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Components/amqp/composer.json | 1 - src/Components/apidoc/composer.json | 1 - src/Components/kafka/composer.json | 1 - src/Components/mqtt/composer.json | 1 - src/Components/pgsql/composer.json | 1 - src/Components/queue/composer.json | 1 - 6 files changed, 6 deletions(-) diff --git a/src/Components/amqp/composer.json b/src/Components/amqp/composer.json index 1f9077cdf4..32442fc534 100644 --- a/src/Components/amqp/composer.json +++ b/src/Components/amqp/composer.json @@ -8,7 +8,6 @@ "php-amqplib/php-amqplib": "^3.5" }, "require-dev": { - "swoole/ide-helper": "~5.0" }, "autoload": { "psr-4": { diff --git a/src/Components/apidoc/composer.json b/src/Components/apidoc/composer.json index d61c7946a3..36aceb0de0 100644 --- a/src/Components/apidoc/composer.json +++ b/src/Components/apidoc/composer.json @@ -8,7 +8,6 @@ "doctrine/annotations": "^1.7" }, "require-dev": { - "swoole/ide-helper": "~5.0" }, "autoload": { "psr-4": { diff --git a/src/Components/kafka/composer.json b/src/Components/kafka/composer.json index 7127ed6815..4780a43b94 100644 --- a/src/Components/kafka/composer.json +++ b/src/Components/kafka/composer.json @@ -8,7 +8,6 @@ "longlang/phpkafka": "^1.1" }, "require-dev": { - "swoole/ide-helper": "~5.0" }, "autoload": { "psr-4": { diff --git a/src/Components/mqtt/composer.json b/src/Components/mqtt/composer.json index eaa001a5d8..183a107bca 100644 --- a/src/Components/mqtt/composer.json +++ b/src/Components/mqtt/composer.json @@ -7,7 +7,6 @@ "binsoul/net-mqtt": "^0.8.0" }, "require-dev": { - "swoole/ide-helper": "~5.0" }, "autoload": { "psr-4": { diff --git a/src/Components/pgsql/composer.json b/src/Components/pgsql/composer.json index 29bab24e73..204ea6f7d0 100644 --- a/src/Components/pgsql/composer.json +++ b/src/Components/pgsql/composer.json @@ -5,7 +5,6 @@ "description": "imi 框架配套的 pgsql 组件", "require": {}, "require-dev": { - "swoole/ide-helper": "~5.0" }, "autoload": { "psr-4": { diff --git a/src/Components/queue/composer.json b/src/Components/queue/composer.json index adb5c6333e..265eeb422a 100644 --- a/src/Components/queue/composer.json +++ b/src/Components/queue/composer.json @@ -5,7 +5,6 @@ "description": "imi 框架的队列组件，使用 Redis 作为持久化", "require": {}, "require-dev": { - "swoole/ide-helper": "~5.0" }, "autoload": { "psr-4": { From f0890539944939afbcc1e155964d87b5c42fbce9 Mon Sep 17 00:00:00 2001 From: auooru Date: Fri, 27 Oct 2023 14:37:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Update:=20=E6=9B=B4=E6=96=B0=20ci=20?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/codecov.yml | 4 ++-- .github/workflows/daily-test.yml | 4 ++-- .github/workflows/markdownlint.yml | 2 +- .github/workflows/phpcs.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/rector.yml | 2 +- .github/workflows/split-repository.yml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58f2df44a9..20f8b93e80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,9 +43,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/composer key: ${{ runner.os }}-composer-${{ matrix.swoole.version }}-${{ hashFiles('/composer.json') }} @@ -125,9 +125,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/composer key: ${{ runner.os }}-composer-${{ matrix.swoole.version }}-${{ hashFiles('/composer.json') }} @@ -196,7 +196,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Services shell: bash run: | @@ -216,7 +216,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ matrix.swoole-cli }}-${{ hashFiles('/composer.json') }} @@ -293,7 +293,7 @@ jobs: ROADRUNNER_DOCKER_VERSION: ${{ matrix.roadrunner }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup MySQL uses: shogo82148/actions-setup-mysql@v1 with: @@ -334,7 +334,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ env.php-versions }}-${{ hashFiles('/composer.json') }} @@ -414,7 +414,7 @@ jobs: ROADRUNNER_DOCKER_VERSION: ${{ matrix.roadrunner }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup MySQL uses: shogo82148/actions-setup-mysql@v1 diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 692c502cb7..6c2b2a12e3 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -121,7 +121,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install libs run: sudo apt update && sudo apt install -y libevent-dev libcurl4-openssl-dev libc-ares-dev libpq-dev postgresql-client - name: Setup PHP @@ -179,7 +179,7 @@ jobs: needs: test steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: diff --git a/.github/workflows/daily-test.yml b/.github/workflows/daily-test.yml index ad15165447..f805a2f9ad 100644 --- a/.github/workflows/daily-test.yml +++ b/.github/workflows/daily-test.yml @@ -28,9 +28,9 @@ jobs: COMPOSER_ENV: --ignore-platform-reqs steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/composer key: ${{ runner.os }}-composer-${{ matrix.swoole.version }}-${{ hashFiles('/composer.json') }} diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index f120bca30c..a7505d07a8 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare run: | diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index 6a712ec9ec..e8295a8774 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -24,7 +24,7 @@ jobs: ENV_SERVICE: swoole-only steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare run: | diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 07f31b8e4b..bcd4626858 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -28,7 +28,7 @@ jobs: ENV_SERVICE: swoole-only steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare run: | diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index c1ccff2517..a604f489b3 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -28,7 +28,7 @@ jobs: ENV_SERVICE: swoole-only steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare run: | diff --git a/.github/workflows/split-repository.yml b/.github/workflows/split-repository.yml index 65e62cef9b..ddeb7de456 100644 --- a/.github/workflows/split-repository.yml +++ b/.github/workflows/split-repository.yml @@ -16,7 +16,7 @@ jobs: GITHUB_REPOSITORY: ${{ github.repository }} steps: - uses: ahmadnassri/action-workflow-queue@v1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 From d13bdb8c2a541d55d77a40d9373b31ec17df56e5 Mon Sep 17 00:00:00 2001 From: auooru Date: Fri, 27 Oct 2023 15:03:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Update:=20=E5=AF=B9=20ci=20=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E8=BF=9B=E8=A1=8C=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 18 ++++++++++++++++++ .github/workflows/phpcs.yml | 6 ++++++ .github/workflows/phpstan.yml | 6 ++++++ .github/workflows/rector.yml | 6 ++++++ 4 files changed, 36 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20f8b93e80..605741a3ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,11 +222,17 @@ jobs: key: ${{ runner.os }}-composer-${{ matrix.swoole-cli }}-${{ hashFiles('/composer.json') }} - name: Prepare run: | + echo "::group::Composer install" composer update --prefer-dist --no-progress + echo "::endgroup::" + echo "::group::Kafka prepare" .github/prepare-kafka.sh + echo "::endgroup::" + echo "::group::Table Init" docker exec mysql mysql -uroot -p -e "ALTER USER 'root'@'%' IDENTIFIED WITH mysql_native_password BY 'root';flush privileges;" tests/db/install-db.sh docker exec postgres psql -d db_imi_test -U root -f /imi/.github/pgsql.sql + echo "::endgroup::" echo "test_prepared=1" >> $GITHUB_ENV - name: Test @@ -340,9 +346,15 @@ jobs: key: ${{ runner.os }}-composer-${{ env.php-versions }}-${{ hashFiles('/composer.json') }} - name: Prepare run: | + echo "::group::Env prepare" mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS db_imi_test;' + echo "::endgroup::" + echo "::group::Composer install" composer update --prefer-dist --no-progress + echo "::endgroup::" + echo "::group::Table Init" tests/db/install-db.sh + echo "::endgroup::" - name: Install RoadRunner run: | @@ -441,9 +453,15 @@ jobs: - name: Prepare run: | + Write-Output "::group::Env prepare" mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS db_imi_test;' + Write-Output "::endgroup::" + Write-Output "::group::Composer install" composer update --prefer-dist --no-progress + Write-Output "::endgroup::" + Write-Output "::group::Table Init" php src\Cli\bin\imi-cli generate/table --app-namespace "Imi\Test\Component" + Write-Output "::endgroup::" - name: Install RoadRunner run: | diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index e8295a8774..0e4795762c 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -28,11 +28,17 @@ jobs: - name: Prepare run: | + echo "::group::Env prepare" docker-compose -f ./.github/docker-compose.yml up -d ${ENV_SERVICE} + echo "::endgroup::" + echo "::group::Env info" docker exec ${ENV_SERVICE} php -v docker exec ${ENV_SERVICE} composer -V + echo "::endgroup::" + echo "::group::Composer install" docker exec ${ENV_SERVICE} composer update --no-interaction --prefer-dist --no-progress docker exec ${ENV_SERVICE} bash -c "cd split-repository && composer install --no-interaction --prefer-dist --no-progress" + echo "::endgroup::" - name: Coding Standards Tests run: docker exec ${ENV_SERVICE} ./vendor/bin/php-cs-fixer fix --dry-run --diff -vvv diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index bcd4626858..3d82f29e89 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -32,13 +32,19 @@ jobs: - name: Prepare run: | + echo "::group::Env prepare" docker-compose -f ./.github/docker-compose.yml up -d ${ENV_SERVICE} + echo "::endgroup::" + echo "::group::Env info" docker exec ${ENV_SERVICE} php -v docker exec ${ENV_SERVICE} php -m docker exec ${ENV_SERVICE} php --ri swoole docker exec ${ENV_SERVICE} composer -V + echo "::endgroup::" + echo "::group::Composer install" docker exec ${ENV_SERVICE} composer update --no-interaction --prefer-dist --no-progress docker exec ${ENV_SERVICE} bash -c "cd split-repository && composer install --no-interaction --prefer-dist --no-progress" + echo "::endgroup::" echo "test_prepared=1" >> $GITHUB_ENV - name: Analyse core diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml index a604f489b3..688b34b57a 100644 --- a/.github/workflows/rector.yml +++ b/.github/workflows/rector.yml @@ -32,13 +32,19 @@ jobs: - name: Prepare run: | + echo "::group::Env prepare" docker-compose -f ./.github/docker-compose.yml up -d ${ENV_SERVICE} + echo "::endgroup::" + echo "::group::Env info" docker exec ${ENV_SERVICE} php -v docker exec ${ENV_SERVICE} php -m docker exec ${ENV_SERVICE} php --ri swoole docker exec ${ENV_SERVICE} composer -V + echo "::endgroup::" + echo "::group::Composer install" docker exec ${ENV_SERVICE} composer update --no-interaction --prefer-dist --no-progress docker exec ${ENV_SERVICE} bash -c "cd split-repository && composer install --no-interaction --prefer-dist --no-progress" + echo "::endgroup::" echo "test_prepared=1" >> $GITHUB_ENV - name: Analyse core