Skip to content

Commit

Permalink
Merge pull request #498 from nextcloud/backport/497/stable24
Browse files Browse the repository at this point in the history
[stable24] fix(integrity): expect pkg mgmt files
  • Loading branch information
blizzz authored Sep 19, 2023
2 parents bd6a411 + bb66b5b commit 703833f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 19 deletions.
18 changes: 0 additions & 18 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,24 +176,6 @@ trigger:
- pull_request
- push

---
kind: pipeline
name: php74-master

steps:
- name: php74-master
image: ghcr.io/nextcloud/continuous-integration-php7.4:latest
commands:
- make test-master

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: php80-master
Expand Down
4 changes: 4 additions & 0 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,13 @@ private function getExpectedElementsList() {
'index.html',
'indie.json',
'.user.ini',
'composer.json',
'composer.lock',
'console.php',
'cron.php',
'index.php',
'package.json',
'package-lock.json',
'public.php',
'remote.php',
'status.php',
Expand Down
4 changes: 4 additions & 0 deletions lib/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,13 @@ private function getExpectedElementsList() {
'index.html',
'indie.json',
'.user.ini',
'composer.json',
'composer.lock',
'console.php',
'cron.php',
'index.php',
'package.json',
'package-lock.json',
'public.php',
'remote.php',
'status.php',
Expand Down
2 changes: 1 addition & 1 deletion tests/features/master.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Feature: CLI updater - master base
And the version number is decreased in the config.php to enforce upgrade
When the CLI updater is run successfully
And the output should contain "Update successful"
Then the installed version should be 22.0
Then the installed version should be 28.0
And maintenance mode should be off
And upgrade is not required
Binary file modified updater.phar
Binary file not shown.

0 comments on commit 703833f

Please sign in to comment.