Skip to content

Commit

Permalink
make composer install work over a larger range
Browse files Browse the repository at this point in the history
not locking is fine since we only have dev-dependencies

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
icewind1991 committed Mar 19, 2024
1 parent 9377d50 commit 15608f1
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ 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 delete nextcloud/ocp
composer i
- name: Set up Nextcloud
env:
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/phpunit-mysql.yml.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 3ca2bd2..2dd16f5 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -117,7 +117,10 @@ 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 delete nextcloud/ocp
+ composer i

- name: Set up Nextcloud
env:
2 changes: 1 addition & 1 deletion .github/workflows/psalm-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/psalm-matrix.yml.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 15608f1

Please sign in to comment.