Test with PHP 8.1 (#324)

atk4 · Oct 1, 2021 · cfd9cf7 · cfd9cf7
1 parent 2b0e35f
commit cfd9cf7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build Release
     runs-on: ubuntu-latest
     container:
-      image: atk4/image:latest
+      image: ghcr.io/mvorisek/image-php:latest
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -11,7 +11,7 @@ jobs:
     name: Smoke
     runs-on: ubuntu-latest
     container:
-      image: atk4/image:${{ matrix.php }}
+      image: ghcr.io/mvorisek/image-php:${{ matrix.php }}
     strategy:
       fail-fast: false
       matrix:
@@ -75,19 +75,17 @@ jobs:
     name: Unit
     runs-on: ubuntu-latest
     container:
-      image: atk4/image:${{ matrix.php }}
+      image: ghcr.io/mvorisek/image-php:${{ matrix.php }}
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', 'latest']
-        type: ['Phpunit']
+        php: ['7.4', '8.0', '8.1']
+        type: ['Phpunit', 'Phpunit Lowest']
         include:
-          - php: 'latest'
-            type: 'Phpunit Lowest'
           - php: 'latest'
             type: 'Phpunit Burn'
     env:
-      LOG_COVERAGE: "${{ fromJSON('{true: \"1\", false: \"\"}')[matrix.php == 'latest' && matrix.type == 'Phpunit' && (github.event_name == 'pull_request' || (github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')))] }}"
+      LOG_COVERAGE: "${{ fromJSON('{true: \"1\", false: \"\"}')[matrix.php == '8.0' && matrix.type == 'Phpunit' && (github.event_name == 'pull_request' || (github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')))] }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -42,18 +42,18 @@
         "atk4/data": "dev-develop",
         "ergebnis/composer-normalize": "^2.13",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "johnkary/phpunit-speedtrap": "^3.2",
+        "johnkary/phpunit-speedtrap": "^3.3",
         "phpstan/phpstan": "^0.12.58",
-        "phpunit/phpunit": ">=9.3",
+        "phpunit/phpunit": "^9.5.5",
         "symfony/contracts": ">=1.1"
     },
     "require-dev-release": {
         "atk4/data": "~3.1.0",
         "ergebnis/composer-normalize": "^2.13",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "johnkary/phpunit-speedtrap": "^3.2",
+        "johnkary/phpunit-speedtrap": "^3.3",
         "phpstan/phpstan": "^0.12.58",
-        "phpunit/phpunit": ">=9.3",
+        "phpunit/phpunit": "^9.5.5",
         "symfony/contracts": ">=1.1"
     },
     "config": {