From fa7554ea8ea1e037fdc928dd94bd64da38f3bad7 Mon Sep 17 00:00:00 2001 From: JonLee Date: Mon, 3 Aug 2026 14:49:35 +0800 Subject: [PATCH 1/2] fix: update phpunit workflow matrix and casbin dependency constraints --- .github/workflows/phpunit.yml | 7 ++----- composer.json | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 884e652..9e34fb9 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -19,11 +19,8 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.0, 8.1, 8.2, 8.3, 8.4 ] - thinkphp: [ "~8.0.3", "^8.1"] - exclude: - - php: 8.4 - thinkphp: "~8.0.3" + php: [ 8.0, 8.1, 8.2, 8.3, 8.4, 8.5 ] + thinkphp: [ "^8.0", "^8.1"] name: ThinkPHP${{ matrix.thinkphp }}-PHP${{ matrix.php }} diff --git a/composer.json b/composer.json index 600cc32..736d551 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "license": "Apache-2.0", "require": { "php": ">=8.0", - "casbin/casbin": "~4.0.2", + "casbin/casbin": "^4.0.2", "topthink/framework": "^8.0.3", "topthink/think-migration": "^3.1.0" }, From e6c7072af09c644e691912f665c7875a5d22db4c Mon Sep 17 00:00:00 2001 From: JonLee Date: Mon, 3 Aug 2026 15:05:05 +0800 Subject: [PATCH 2/2] ci: bump GitHub Actions dependencies in phpunit workflow --- .github/workflows/phpunit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 9e34fb9..59c63a0 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v7 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -40,7 +40,7 @@ jobs: - name: Cache Composer packages id: composer-cache - uses: actions/cache@v3 + uses: actions/cache@v6 with: path: vendor key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.thinkphp }}-${{ hashFiles('**/composer.lock') }} @@ -79,8 +79,8 @@ jobs: runs-on: ubuntu-latest needs: [ test ] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v7 + - uses: actions/setup-node@v7 with: node-version: 'lts/*'