Merge pull request #501 from nextcloud/backport/499/stable22

[stable22] fix(integrity): expect pkg mgmt files

.drone.yml

@@ -3,7 +3,7 @@ name: check-same-code-base
 
 steps:
   - name: check-same-code-base
-    image: nextcloudci/php8.0:php8.0-1
+    image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     commands:
       - make check-same-code-base
 
@@ -21,7 +21,8 @@ name: php73-cli
 
 steps:
   - name: php73-cli
-    image: nextcloudci/php7.3:php7.3-5
+    image: ghcr.io/nextcloud/continuous-integration-php7.3:latest
+
     commands:
       - make test-cli
 
@@ -39,7 +40,7 @@ name: php74-cli
 
 steps:
   - name: php74-cli
-    image: nextcloudci/php7.4:php7.4-3
+    image: ghcr.io/nextcloud/continuous-integration-php7.4:latest
     commands:
       - make test-cli
 
@@ -56,7 +57,7 @@ name: php73-stable19
 
 steps:
   - name: php73-stable19
-    image: nextcloudci/php7.3:php7.3-5
+    image: ghcr.io/nextcloud/continuous-integration-php7.3:latest
     commands:
       - make test-stable19
 
@@ -74,7 +75,7 @@ name: php74-stable19
 
 steps:
   - name: php74-stable19
-    image: nextcloudci/php7.4:php7.4-3
+    image: ghcr.io/nextcloud/continuous-integration-php7.4:latest
     commands:
       - make test-stable19
 
@@ -92,7 +93,7 @@ name: php73-stable20
 
 steps:
   - name: php73-stable20
-    image: nextcloudci/php7.3:php7.3-5
+    image: ghcr.io/nextcloud/continuous-integration-php7.3:latest
     commands:
       - make test-stable20
 
@@ -110,7 +111,7 @@ name: php74-stable20
 
 steps:
   - name: php74-stable20
-    image: nextcloudci/php7.4:php7.4-3
+    image: ghcr.io/nextcloud/continuous-integration-php7.4:latest
     commands:
       - make test-stable20
 
@@ -128,7 +129,7 @@ name: php73-stable21
 
 steps:
   - name: php73-stable21
-    image: nextcloudci/php7.3:php7.3-5
+    image: ghcr.io/nextcloud/continuous-integration-php7.3:latest
     commands:
       - make test-stable21
 
@@ -146,7 +147,7 @@ name: php74-stable21
 
 steps:
   - name: php74-stable21
-    image: nextcloudci/php7.4:php7.4-3
+    image: ghcr.io/nextcloud/continuous-integration-php7.4:latest
     commands:
       - make test-stable21
 
@@ -164,7 +165,7 @@ name: php80-stable21
 
 steps:
   - name: php80-stable21
-    image: nextcloudci/php8.0:php8.0-1
+    image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     commands:
       - make test-stable21
 
@@ -176,48 +177,13 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: php73-master
-
-steps:
-  - name: php73-master
-    image: nextcloudci/php7.3:php7.3-2
-    commands:
-      - make test-master
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: php74-master
-
-steps:
-  - name: php74-master
-    image: nextcloudci/php7.4:php7.4-2
-    commands:
-      - make test-master
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
 ---
 kind: pipeline
 name: php80-master
 
 steps:
   - name: php80-master
-    image: nextcloudci/php8.0:php8.0-1
+    image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     commands:
       - make test-master
 

index.php

@@ -326,6 +326,7 @@ class Updater {
 			'config',
 			'core',
 			'data',
+			'dist',
 			'l10n',
 			'lib',
 			'ocs',
@@ -340,9 +341,13 @@ class Updater {
 			'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',

lib/Updater.php

@@ -209,6 +209,7 @@ class Updater {
 			'config',
 			'core',
 			'data',
+			'dist',
 			'l10n',
 			'lib',
 			'ocs',
@@ -223,9 +224,13 @@ class Updater {
 			'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',

tests/features/master.feature

@@ -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