Skip to content

Commit 4e80e2f

Browse files
authored
Merge pull request #7743 from nextcloud/backport/7701/stable29
[stable29] do not re-install phpunit in integration ci
2 parents 14c10f0 + 09a439e commit 4e80e2f

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/integration.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
6464
git submodule sync --recursive
6565
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
66-
cd build/integration && composer require --dev phpunit/phpunit:~9
6766
6867
- name: Checkout app
6968
uses: actions/[email protected]

tests/integration/composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2+
"config": {
3+
"platform": {
4+
"php": "8.0.2"
5+
},
6+
"sort-packages": true
7+
},
28
"require-dev": {
39
"phpunit/phpunit": "~9",
4-
"behat/behat": "~3.14.0",
10+
"behat/behat": "^3.14.0",
511
"guzzlehttp/guzzle": "7.8.1",
612
"jarnaiz/behat-junit-formatter": "^1.3",
713
"sabre/dav": "4.6.0",

0 commit comments

Comments
 (0)