From babc5ccec91821a7613c96725f38d2202c677d31 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 5 Oct 2023 12:44:00 +0200 Subject: [PATCH 1/2] enh(integrity): do not expect ocm-provider anymore Signed-off-by: Arthur Schiwon --- index.php | 1 - lib/Updater.php | 1 - updater.phar | Bin 760620 -> 760619 bytes 3 files changed, 2 deletions(-) diff --git a/index.php b/index.php index 5dc80709..45b449ba 100644 --- a/index.php +++ b/index.php @@ -261,7 +261,6 @@ private function getExpectedElementsList(): array { 'lib', 'ocs', 'ocs-provider', - 'ocm-provider', 'resources', 'settings', 'themes', diff --git a/lib/Updater.php b/lib/Updater.php index 4adc6820..cae16351 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -223,7 +223,6 @@ private function getExpectedElementsList(): array { 'lib', 'ocs', 'ocs-provider', - 'ocm-provider', 'resources', 'settings', 'themes', diff --git a/updater.phar b/updater.phar index d21639a669907179291ef3afec22d9e3970e7c78..89b31f753980e64064a8ea0c3af4a2ae688d7513 100755 GIT binary patch delta 5494 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 T7;$0EmPG$t($!?XVn-Uzmx From bd9e433e5d9275f609cb4dab6e5b2a4a7211d05b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 9 Nov 2023 12:05:49 +0100 Subject: [PATCH 2/2] ci(targets): remove all non-master tests Signed-off-by: Arthur Schiwon --- .github/workflows/test-cli.yml | 39 -------------- .github/workflows/test-master.yml | 2 +- .github/workflows/test-stable.yml | 58 --------------------- Makefile | 12 ----- tests/features/cli.feature | 84 ------------------------------- tests/features/stable24.feature | 22 -------- tests/features/stable25.feature | 54 -------------------- tests/features/stable26.feature | 20 -------- 8 files changed, 1 insertion(+), 290 deletions(-) delete mode 100644 .github/workflows/test-cli.yml delete mode 100644 .github/workflows/test-stable.yml delete mode 100644 tests/features/cli.feature delete mode 100644 tests/features/stable24.feature delete mode 100644 tests/features/stable25.feature delete mode 100644 tests/features/stable26.feature diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-cli.yml deleted file mode 100644 index 61537451..00000000 --- a/.github/workflows/test-cli.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Test cli - -on: - pull_request: - push: - branches: - - main - - master - - stable* - -permissions: - contents: read - -jobs: - test-cli: - runs-on: ubuntu-latest - strategy: - matrix: - php-versions: ["8.1"] - - name: test-cli - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip - coverage: none - ini-file: development - - - name: Install dependencies - run: composer i - - - name: test-cli - run: make test-cli diff --git a/.github/workflows/test-master.yml b/.github/workflows/test-master.yml index 24deeb59..8d1a7482 100644 --- a/.github/workflows/test-master.yml +++ b/.github/workflows/test-master.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ["8.0", "8.1", "8.2"] + php-versions: ["8.0", "8.1", "8.2", "8.3"] name: test-master diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml deleted file mode 100644 index ce32e9ec..00000000 --- a/.github/workflows/test-stable.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Test stable - -on: - pull_request: - push: - branches: - - main - - master - - stable* - -permissions: - contents: read - -jobs: - test-stable: - runs-on: ubuntu-latest - strategy: - matrix: - php-versions: ["8.0", "8.1", "8.2"] - nextcloud-versions: ["24", "25", "26"] - exclude: - - php-versions: "8.2" - nextcloud-versions: "25" - - php-versions: "8.2" - nextcloud-versions: "24" - - - name: test-stable - - steps: - - name: Checkout - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - - - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 - with: - php-version: ${{ matrix.php-versions }} - extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip - coverage: none - ini-file: development - - - name: Install dependencies - run: composer i - - - name: test-stable${{ matrix.nextcloud-versions }} - run: make test-stable${{ matrix.nextcloud-versions }} - - summary: - runs-on: ubuntu-latest - needs: test-stable - - if: always() - - name: test-stable-summary - - steps: - - name: Summary status - run: if ${{ needs.test-stable.result != 'success' }}; then exit 1; fi diff --git a/Makefile b/Makefile index 7a7b2073..c63d8d21 100644 --- a/Makefile +++ b/Makefile @@ -22,18 +22,6 @@ test/vendor: test: updater.phar test/vendor cd tests && vendor/behat/behat/bin/behat -test-cli: updater.phar test/vendor - cd tests && vendor/behat/behat/bin/behat features/cli.feature - -test-stable24: updater.phar test/vendor - cd tests && vendor/behat/behat/bin/behat features/stable24.feature - -test-stable25: updater.phar test/vendor - cd tests && vendor/behat/behat/bin/behat features/stable25.feature - -test-stable26: updater.phar test/vendor - cd tests && vendor/behat/behat/bin/behat features/stable26.feature - test-master: updater.phar test/vendor cd tests && vendor/behat/behat/bin/behat features/master.feature diff --git a/tests/features/cli.feature b/tests/features/cli.feature deleted file mode 100644 index 4ef6754f..00000000 --- a/tests/features/cli.feature +++ /dev/null @@ -1,84 +0,0 @@ -Feature: CLI updater - - Scenario: No update is available - 25.0.0 - Given the current version is 25.0.0 - When the CLI updater is run - Then the output should contain "Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?" - - Scenario: No update is available - 25.0.0 - Given the current installed version is 25.0.0 - And there is no update available - When the CLI updater is run successfully - Then the installed version should be 25.0.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 25.0.0 to 25.0.1 - Given the current installed version is 25.0.0 - And there is an update to version 25.0.1 available - When the CLI updater is run successfully - Then the installed version should be 25.0.1 - And maintenance mode should be off - And upgrade is not required - - Scenario: Invalid update is available - 25.0.0 to 25.0.503 - Given the current installed version is 25.0.0 - And there is an update to version 25.0.503 available - When the CLI updater is run - Then the return code should not be 0 - And the output should contain "Download failed - Not Found (HTTP 404)" - And the installed version should be 25.0.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update without valid signature is being offered - 24.0.0 to 24.0.3 - Given the current installed version is 24.0.0 - # This works because 24.0.3 is in the signature list with an invalid signature - And there is an update to version 24.0.3 available - When the CLI updater is run - Then the return code should not be 0 - And the output should contain "Signature of update is not valid" - And the installed version should be 24.0.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update to older version - 25.0.0 to 24.0.2 - Given the current installed version is 25.0.0 - And there is an update to version 24.0.2 available - When the CLI updater is run - Then the return code should not be 0 - And the output should contain "Downloaded version is lower than installed version" - And the installed version should be 25.0.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available but autoupdate is disabled - 25.0.0 to 25.0.1 - Given the current installed version is 25.0.0 - And the autoupdater is disabled - And there is an update to version 25.0.1 available - When the CLI updater is run - Then the installed version should be 25.0.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available and apps2 folder is there and configured - 25.0.0 to 25.0.1 - Given the current installed version is 25.0.0 - And there is an update to version 25.0.1 available - And there is a folder called "apps2" - And there is a config for a secondary apps directory called "apps2" - When the CLI updater is run successfully - Then the installed version should be 25.0.1 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available and apps2 folder is there and not configured - 25.0.0 to 25.0.1 - Given the current installed version is 25.0.0 - And there is an update to version 25.0.1 available - And there is a folder called "apps2" - When the CLI updater is run - Then the return code should not be 0 - And the output should contain "The following extra files have been found" - And the output should contain "apps2" - And the installed version should be 25.0.0 - And maintenance mode should be off - And upgrade is not required diff --git a/tests/features/stable24.feature b/tests/features/stable24.feature deleted file mode 100644 index cb8f2b99..00000000 --- a/tests/features/stable24.feature +++ /dev/null @@ -1,22 +0,0 @@ -Feature: CLI updater - stable24 base - - Scenario: Update is available - 24.0.0 to 24.0.1 - Given the current installed version is 24.0.0 - And there is an update to version 24.0.1 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 24.0.1 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 24.0.1 to 25.0.0 - Given the current installed version is 24.0.1 - And PHP is at least in version 8.0 - And the current channel is "beta" - And there is an update to version 25.0.0 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 25.0.0 - And maintenance mode should be off - And upgrade is not required - diff --git a/tests/features/stable25.feature b/tests/features/stable25.feature deleted file mode 100644 index 6e377fbc..00000000 --- a/tests/features/stable25.feature +++ /dev/null @@ -1,54 +0,0 @@ -Feature: CLI updater - stable25 base - - Scenario: Update is available - 25.0.0 beta 1 to 25.0.0 rc 1 - Given the current installed version is 25.0.0beta1 - And there is an update to prerelease version "25.0.0rc1" available - 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 25.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available but unexpected folder found - 25.0.6 to 25.0.7 - Given the current installed version is 25.0.6 - And there is an update to version 25.0.7 available - And there is a folder called "test123" - When the CLI updater is run - Then the return code should not be 0 - And the output should contain "The following extra files have been found" - Then the installed version should be 25.0.6 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available and .well-known folder exist - 25.0.6 to 25.0.7 - Given the current installed version is 25.0.6 - And there is an update to version 25.0.7 available - And there is a folder called ".well-known" - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 25.0.7 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available and .rnd file exist - 25.0.6 to 25.0.7 - Given the current installed version is 25.0.6 - And there is an update to version 25.0.7 available - And there is a folder called ".rnd" - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 25.0.7 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 25.0.0 to beta - Given the current installed version is 25.0.0rc1 - And PHP is at least in version 8.0 - And the current channel is "beta" - And there is an update to version 26.0.0 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 26.0 - And maintenance mode should be off - And upgrade is not required - diff --git a/tests/features/stable26.feature b/tests/features/stable26.feature deleted file mode 100644 index d35a5b89..00000000 --- a/tests/features/stable26.feature +++ /dev/null @@ -1,20 +0,0 @@ -Feature: CLI updater - stable26 base - - Scenario: Update is available - 26.0.0 beta 3 to 26.0.0 beta 4 - Given the current installed version is 26.0.0beta3 - And there is an update to prerelease version "26.0.0beta4" available - 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 26.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 26.0.0 RC 1 to 26.0.0 - Given the current installed version is 26.0.0rc1 - And there is an update to version 26.0.0 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 26.0 - And maintenance mode should be off - And upgrade is not required