run ci on composer v1 and v2

doctrine · Nov 28, 2020 · 69c41c0 · 69c41c0
1 parent b6959e9
commit 69c41c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -38,6 +38,7 @@ jobs:
 
     strategy:
       matrix:
+        composer: [1, 2]
         php-version:
           - "7.2"
           - "7.3"
@@ -69,9 +70,12 @@ jobs:
         uses: "actions/cache@v2"
         with:
           path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
+          key: "php-${{ matrix.php-version }}-composer-${{ matrix.composer }}-locked-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
+      - name: "Get the right composer"
+        run: "composer self-update --${{ matrix.composer }}"
+
       - name: "Install dependencies with composer"
         run: "composer update --no-interaction --prefer-dist --no-progress"
         if: "${{ matrix.deps == 'normal' }}"

diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "doctrine/orm": "^2.6",
         "doctrine/persistence": "^1.3 || ^2.0",
         "doctrine/sql-formatter": "^1.0",
-        "ergebnis/composer-normalize": "^2.11",
+        "ergebnis/composer-normalize": "^2.9",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-deprecation-rules": "^0.12",
         "phpstan/phpstan-phpunit": "^0.12",