From 675b0795a36a3503db4f36080175b06bd364352a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Mar 2024 16:22:57 +0100 Subject: [PATCH 1/3] don't install nextcloud/ocp for phpunit Signed-off-by: Robin Appelman --- workflow-templates/phpunit-mariadb.yml | 4 +++- workflow-templates/phpunit-mysql.yml | 4 +++- workflow-templates/phpunit-oci.yml | 4 +++- workflow-templates/phpunit-pgsql.yml | 4 +++- workflow-templates/phpunit-sqlite.yml | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/workflow-templates/phpunit-mariadb.yml b/workflow-templates/phpunit-mariadb.yml index 71d029b..c890abe 100644 --- a/workflow-templates/phpunit-mariadb.yml +++ b/workflow-templates/phpunit-mariadb.yml @@ -122,7 +122,9 @@ jobs: # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Set up Nextcloud env: diff --git a/workflow-templates/phpunit-mysql.yml b/workflow-templates/phpunit-mysql.yml index 19b7269..d40e9f4 100644 --- a/workflow-templates/phpunit-mysql.yml +++ b/workflow-templates/phpunit-mysql.yml @@ -120,7 +120,9 @@ jobs: # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Set up Nextcloud env: diff --git a/workflow-templates/phpunit-oci.yml b/workflow-templates/phpunit-oci.yml index aa6fb49..7efc3a4 100644 --- a/workflow-templates/phpunit-oci.yml +++ b/workflow-templates/phpunit-oci.yml @@ -128,7 +128,9 @@ jobs: # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Set up Nextcloud env: diff --git a/workflow-templates/phpunit-pgsql.yml b/workflow-templates/phpunit-pgsql.yml index 4198b7c..cb160f6 100644 --- a/workflow-templates/phpunit-pgsql.yml +++ b/workflow-templates/phpunit-pgsql.yml @@ -118,7 +118,9 @@ jobs: # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Set up Nextcloud env: diff --git a/workflow-templates/phpunit-sqlite.yml b/workflow-templates/phpunit-sqlite.yml index 4592725..81da5b3 100644 --- a/workflow-templates/phpunit-sqlite.yml +++ b/workflow-templates/phpunit-sqlite.yml @@ -107,7 +107,9 @@ jobs: # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Set up Nextcloud env: From 3f7447e979a9c3391477b1a6aefe8023fdcf994e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Mar 2024 16:23:15 +0100 Subject: [PATCH 2/3] don't install nextcloud/ocp for lint-php-cs Signed-off-by: Robin Appelman --- workflow-templates/lint-php-cs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow-templates/lint-php-cs.yml b/workflow-templates/lint-php-cs.yml index 4f6e5b6..a8c14aa 100644 --- a/workflow-templates/lint-php-cs.yml +++ b/workflow-templates/lint-php-cs.yml @@ -42,7 +42,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install dependencies - run: composer i + run: | + composer remove nextcloud/ocp --dev + composer i - name: Lint run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) From edcd616a43017f44a914e1395c806bb56a452e74 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Mar 2024 16:23:52 +0100 Subject: [PATCH 3/3] 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 fff919a..484291a 100644 --- a/workflow-templates/psalm-matrix.yml +++ b/workflow-templates/psalm-matrix.yml @@ -50,9 +50,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 ebfa72d..2513555 100644 --- a/workflow-templates/psalm.yml +++ b/workflow-templates/psalm.yml @@ -38,7 +38,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