make composer install work over a larger range

not locking is fine since we only have dev-dependencies Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Mar 19, 2024 · 9eb69b4 · 9eb69b4
1 parent 9377d50
commit 9eb69b4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -117,7 +117,7 @@ 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: rm composer.lock && composer i
 
       - name: Set up Nextcloud
         env:

diff --git a/.github/workflows/phpunit-oci.yml.patch b/.github/workflows/phpunit-oci.yml.patch
@@ -0,0 +1,13 @@
+diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
+index cfa4237..3ca2bd2 100644
+--- a/.github/workflows/phpunit-mysql.yml
++++ b/.github/workflows/phpunit-mysql.yml
+@@ -117,7 +117,7 @@ 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: rm composer.lock && composer i
+
+       - name: Set up Nextcloud
+         env:
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
@@ -50,7 +50,7 @@ jobs:
         run: composer i
 
       - name: Install dependencies
-        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
+        run: rm composer.lock && composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
 
       - name: Run coding standards check
         run: composer run psalm

diff --git a/.github/workflows/psalm-matrix.yml.patch b/.github/workflows/psalm-matrix.yml.patch
@@ -11,3 +11,16 @@ index 8e3d42f..4ee30b7 100644
            coverage: none
            ini-file: development
          env:
+diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
+index 4ee30b7..82a540b 100644
+--- a/.github/workflows/psalm-matrix.yml
++++ b/.github/workflows/psalm-matrix.yml
+@@ -50,7 +50,7 @@ jobs:
+         run: composer i
+
+       - name: Install dependencies
+-        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
++        run: rm composer.lock && composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
+
+       - name: Run coding standards check
+         run: composer run psalm