From f9dfe197456f1d061b641f69907c3de5fb28eba3 Mon Sep 17 00:00:00 2001 From: zds <49744633+zds-s@users.noreply.github.com> Date: Sun, 23 Jun 2024 00:50:33 +0800 Subject: [PATCH] Release v2.0.1 (#285) * Apply cs fix * Upgrade actions/create-release:v4 * Upgrade components to 2.0.1 * Update composer.json * Update actions * Update swoole version * Revert "Update swoole version" This reverts commit b585d39f839f351db088b2819bbc8ca81ce819de. --- .github/workflows/build.yml | 7 +++++-- .github/workflows/release.yml | 4 +++- .github/workflows/test.yml | 2 +- .../Controller/DataCenter/DictTypeController.php | 3 +-- composer.json | 16 ++++++++-------- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ca82fad..96bd7534 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build - run: cp -rf .github/workflows/Dockerfile . && docker build -t hyperf . + run: docker build -t hyperf . + - name: docker-compose + run: + docker-compose up -d diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35d51f04..dc325019 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,13 +6,15 @@ on: name: Release +permissions: write-all + jobs: release: name: Release runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Create Release id: create_release uses: actions/create-release@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d652e0b1..5f122746 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: swoole: [ 'swoole' ] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: diff --git a/app/System/Controller/DataCenter/DictTypeController.php b/app/System/Controller/DataCenter/DictTypeController.php index effbca01..f463078d 100644 --- a/app/System/Controller/DataCenter/DictTypeController.php +++ b/app/System/Controller/DataCenter/DictTypeController.php @@ -54,11 +54,10 @@ public function index(): ResponseInterface } /** - * @return ResponseInterface * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ - #[GetMapping("list")] + #[GetMapping('list')] public function list(): ResponseInterface { return $this->success($this->service->getList($this->request->all())); diff --git a/composer.json b/composer.json index 885fb5a7..f192984e 100644 --- a/composer.json +++ b/composer.json @@ -10,14 +10,14 @@ "description": "Quickly build a background management system for web applications", "license": "Apache-2.0", "require": { - "mineadmin/app-store": "^2.0.x-dev", - "xmo/jwt-auth": "^2.0-stable", - "xmo/mine-core": "^2.0-stable", - "xmo/mine-generator": "^2.0-stable", - "xmo/mine-helpers": "^2.0-stable", - "xmo/mine-office": "^2.0-stable", - "xmo/mine-service": "^2.0-stable", - "xmo/mine-translatable": "^2.0-stable" + "mineadmin/app-store": "~2.0", + "xmo/jwt-auth": "~2.0", + "xmo/mine-core": "~2.0", + "xmo/mine-generator": "~2.0", + "xmo/mine-helpers": "~2.0", + "xmo/mine-office": "~2.0", + "xmo/mine-service": "~2.0", + "xmo/mine-translatable": "~2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.0",