Merge branch 'improve-ci-range' into update-dependencies-and-fix-bc-a…

…dd-ci
KentarouTakeda · Jan 4, 2024 · 654d669 · 654d669
2 parents 94d105c + c372bc3
commit 654d669
Showing 1 changed file with 39 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,6 @@ jobs:
   tests:
     name: Tests
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
@@ -19,33 +18,41 @@ jobs:
           - '7.3'
           - '7.4'
           - '8.0'
-        experimental:
-          - false
+          - '8.1'
+          - '8.2'
+          - '8.3'
         include:
-          - php: "8.1"
-            composer-options: "--ignore-platform-reqs"
-            experimental: true
-            dependencies: "highest"
+          - php: '7.2'
+            phpunit: '"^7||^8"'
+          - php: '8.1'
+            phpunit: '"^9"'
+          - php: '8.2'
+            phpunit: '"^9"'
+          - php: '8.3'
+            phpunit: '"^9"'
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.9.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: intl, mbstring
           tools: "composer:v2"
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
+      - name: "Install specific version of phpunit "
+        if: ${{ matrix.phpunit  }}
+        run: composer require --no-interaction --no-progress --no-suggest phpunit/phpunit:${{ matrix.phpunit }}
 
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}
-        run: composer update --prefer-lowest --no-interaction --no-progress --no-suggest ${{ matrix.composer-options }}
+        run: composer update --prefer-lowest --no-interaction --no-progress --no-suggest
 
       - name: "Install highest dependencies"
         if: ${{ matrix.dependencies == 'highest' }}
-        run: composer update --no-interaction --no-progress --no-suggest ${{ matrix.composer-options }}
+        run: composer update --no-interaction --no-progress --no-suggest
 
       - name: "Run tests"
         run: ./vendor/bin/phpunit -c phpunit.xml
@@ -54,14 +61,25 @@ jobs:
     name: Codestyle check on PHP 7.2
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        php:
+          - '7.2'
+        phpunit:
+          - '"^7||^8"'
+
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.1.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: 7.2
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: "Install specific version of phpunit "
+        if: ${{ matrix.phpunit  }}
+        run: composer require --no-interaction --no-progress --no-suggest phpunit/phpunit:${{ matrix.phpunit }}
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
@@ -77,15 +95,21 @@ jobs:
       matrix:
         php:
           - '7.2'
+        phpunit:
+          - '"^7||^8"'
 
     steps:
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.1.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: "Install specific version of phpunit "
+        if: ${{ matrix.phpunit  }}
+        run: composer require --no-interaction --no-progress --no-suggest phpunit/phpunit:${{ matrix.phpunit }}
 
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable