From c4861aeb71ec9d3bf1ebaa6c8eb186ef59e97356 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Mar 2024 16:23:52 +0100 Subject: [PATCH] don't install nextcloud/ocp from the composer file for psalm Signed-off-by: Robin Appelman --- workflow-templates/psalm-matrix.yml | 6 ++++-- workflow-templates/psalm.yml | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/workflow-templates/psalm-matrix.yml b/workflow-templates/psalm-matrix.yml index 8e3d42f3..0f05c28c 100644 --- 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 index b8e12b4e..f162c586 100644 --- 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