don't install nextcloud/ocp from the composer file for psalm

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Mar 20, 2024 · c4861ae · c4861ae
1 parent e5cfcf7
commit c4861ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/workflow-templates/psalm-matrix.yml b/workflow-templates/psalm-matrix.yml
@@ -47,9 +47,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: composer i
+        run: |
+          composer remove nextcloud/ocp --dev
+          composer i
 
-      - name: Install dependencies
+      - name: Install nextcloud/ocp
         run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
 
       - name: Run coding standards check

diff --git a/workflow-templates/psalm.yml b/workflow-templates/psalm.yml
@@ -35,7 +35,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: composer i
+        run: |
+          composer remove nextcloud/ocp --dev
+          composer i
+
+      - name: Install nextcloud/ocp
+        run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
 
       - name: Run coding standards check
         run: composer run psalm