Increase CI matrix to test against more recent PHPUnit & PHP versions (…

…#351)
Jan0707 · Nov 21, 2024 · 1926a13 · 1926a13
1 parent d70e871
commit 1926a13
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 212 deletions.
diff --git a/.github/actions/composer/composer/determine-cache-directory/action.yaml b/.github/actions/composer/composer/determine-cache-directory/action.yaml
diff --git a/.github/actions/composer/composer/install/action.yaml b/.github/actions/composer/composer/install/action.yaml
diff --git a/.github/actions/composer/composer/install/run.sh b/.github/actions/composer/composer/install/run.sh
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -46,20 +46,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
-      - name: "Determine composer cache directory"
-        uses: "./.github/actions/composer/composer/determine-cache-directory"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v4"
-        with:
-          path: "${{ env.COMPOSER_CACHE_DIR }}"
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install ${{ matrix.dependencies }} dependencies with composer"
-        uses: "./.github/actions/composer/composer/install"
+      - uses: "ramsey/composer-install@v3"
         with:
-          dependencies: "${{ matrix.dependencies }}"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run ergebnis/composer-normalize"
         run: "composer normalize --ansi --dry-run"
@@ -86,16 +75,25 @@ jobs:
       fail-fast: false
 
       matrix:
-        php-version:
-          - "7.4"
-
-        phpunit-version:
-          - "9.1.0"
-
-        dependencies:
-          - "lowest"
-          - "locked"
-          - "highest"
+        include:
+          - php-version: "7.4"
+            phpunit-version: "9.1.0"
+            dependencies: "locked"
+          - php-version: "8.0"
+            phpunit-version: "9.6.0"
+            dependencies: "highest"
+          - php-version: "8.1"
+            phpunit-version: "10.0"
+            dependencies: "highest"
+          - php-version: "8.2"
+            phpunit-version: "10.0"
+            dependencies: "highest"
+          - php-version: "8.3"
+            phpunit-version: "11.0"
+            dependencies: "highest"
+          - php-version: "8.4"
+            phpunit-version: "11.0"
+            dependencies: "highest"
 
     steps:
       - name: "Checkout"
@@ -108,23 +106,12 @@ jobs:
           extensions: "${{ env.PHP_EXTENSIONS }}"
           php-version: "${{ matrix.php-version }}"
 
-      - name: "Determine composer cache directory"
-        uses: "./.github/actions/composer/composer/determine-cache-directory"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v4"
-        with:
-          path: "${{ env.COMPOSER_CACHE_DIR }}"
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
       - name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
-        run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --dev --update-with-dependencies"
+        run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --dev --no-update"
 
-      - name: "Install ${{ matrix.dependencies }} dependencies with composer"
-        uses: "./.github/actions/composer/composer/install"
+      - uses: "ramsey/composer-install@v3"
         with:
-          dependencies: "${{ matrix.dependencies }}"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Cache cache directory for phpstan/phpstan"
         uses: "actions/cache@v4"
@@ -153,10 +140,16 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-
+          - "8.4"
+          - "8.3"
+          - "8.2"
+          - "8.1"
+          - "8.0"
         dependencies:
-          - "locked"
+          - "highest"
+        include:
+          - php-version: "7.4"
+            dependencies: "locked"
 
     steps:
       - name: "Checkout"
@@ -172,20 +165,9 @@ jobs:
       - name: "Set up problem matchers for phpunit/phpunit"
         run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\""
 
-      - name: "Determine composer cache directory"
-        uses: "./.github/actions/composer/composer/determine-cache-directory"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v4"
-        with:
-          path: "${{ env.COMPOSER_CACHE_DIR }}"
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
-
-      - name: "Install ${{ matrix.dependencies }} dependencies with composer"
-        uses: "./.github/actions/composer/composer/install"
+      - uses: "ramsey/composer-install@v3"
         with:
-          dependencies: "${{ matrix.dependencies }}"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run tests with phpunit/phpunit"
         run: "vendor/bin/phpunit --configuration=phpunit.xml"