From f90b95e401f534e16573b8cd87424f44806c1000 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 10 Mar 2024 23:37:08 -0700 Subject: [PATCH 1/4] ci: update to stable28 --- .github/workflows/e2e.yaml | 6 +++--- .github/workflows/static-analysis.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 84ed2b98d..3f7f1a04c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -49,7 +49,7 @@ jobs: fail-fast: false matrix: php-versions: ['8.1'] - server-versions: ['stable27'] + server-versions: ['stable28'] services: mysql: @@ -117,7 +117,7 @@ jobs: fail-fast: false matrix: php-versions: ['8.1'] - server-versions: ['stable27'] + server-versions: ['stable28'] services: postgres: @@ -190,7 +190,7 @@ jobs: fail-fast: false matrix: php-versions: ['8.1'] - server-versions: ['stable27'] + server-versions: ['stable28'] steps: - name: Checkout server diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 49f6fc0ed..5b50567b5 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -26,7 +26,7 @@ jobs: with: submodules: true repository: nextcloud/server - ref: stable27 + ref: stable28 - name: Checkout the app uses: actions/checkout@v4 From d44ecacd56434b1239e162a47cb27246bdc70f6f Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 10 Mar 2024 23:40:37 -0700 Subject: [PATCH 2/4] lint: fix psalm issues Signed-off-by: Varun Patil --- lib/Controller/OtherController.php | 6 ++---- lib/Controller/TemplateResponsePatch.php | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Controller/OtherController.php b/lib/Controller/OtherController.php index 516a8514e..3973fb81d 100644 --- a/lib/Controller/OtherController.php +++ b/lib/Controller/OtherController.php @@ -68,9 +68,7 @@ public function getUserConfig(): Http\Response { return Util::guardEx(function () { // get memories version - $version = \OC::$server->get(\OCP\App\IAppManager::class) - ->getAppInfo('memories')['version'] - ; + $version = \OC::$server->get(\OCP\App\IAppManager::class)->getAppVersion('memories'); // get user if logged in try { @@ -136,7 +134,7 @@ public function describeApi(): Http\Response $urlGenerator = \OC::$server->get(\OCP\IURLGenerator::class); $info = [ - 'version' => $appManager->getAppInfo('memories')['version'], + 'version' => $appManager->getAppVersion('memories'), 'baseUrl' => $urlGenerator->linkToRouteAbsolute('memories.Page.main'), 'loginFlowUrl' => $urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.init'), ]; diff --git a/lib/Controller/TemplateResponsePatch.php b/lib/Controller/TemplateResponsePatch.php index 24964669f..c9607d876 100644 --- a/lib/Controller/TemplateResponsePatch.php +++ b/lib/Controller/TemplateResponsePatch.php @@ -6,6 +6,7 @@ use OCP\AppFramework\Http\TemplateResponse; +/** @psalm-suppress MissingTemplateParam */ class TemplateResponsePatch extends TemplateResponse { public function render() From ccc855c44123220f8a85ed39c3aad124fe0ed8f0 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 10 Mar 2024 23:55:32 -0700 Subject: [PATCH 3/4] e2e: remove viewer Signed-off-by: Varun Patil --- .github/workflows/e2e.yaml | 30 ++++++++++++++++++++++++------ scripts/ci-test.sh | 1 - 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 3f7f1a04c..d1993ce8d 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -95,8 +95,16 @@ jobs: DB_PORT: 4444 run: | mkdir data - php occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password - git clone --depth 1 --branch ${{ matrix.server-versions }} https://github.com/nextcloud/viewer apps/viewer + php occ maintenance:install \ + --verbose \ + --database=mysql \ + --database-name=nextcloud \ + --database-host=127.0.0.1 \ + --database-port=$DB_PORT \ + --database-user=root \ + --database-pass=rootpassword \ + --admin-user admin \ + --admin-pass password - name: Run tests run: | @@ -168,8 +176,16 @@ jobs: DB_PORT: 4444 run: | mkdir data - php occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=postgres --database-pass=rootpassword --admin-user admin --admin-pass password - git clone --depth 1 --branch ${{ matrix.server-versions }} https://github.com/nextcloud/viewer apps/viewer + php occ maintenance:install \ + --verbose \ + --database=pgsql \ + --database-name=nextcloud \ + --database-host=127.0.0.1 \ + --database-port=$DB_PORT \ + --database-user=postgres \ + --database-pass=rootpassword \ + --admin-user admin \ + --admin-pass password - name: Run tests run: | @@ -227,8 +243,10 @@ jobs: DB_PORT: 4444 run: | mkdir data - php occ maintenance:install --verbose --admin-user admin --admin-pass password - git clone --depth 1 --branch ${{ matrix.server-versions }} https://github.com/nextcloud/viewer apps/viewer + php occ maintenance:install \ + --verbose \ + --admin-user admin \ + --admin-pass password - name: Run tests run: | diff --git a/scripts/ci-test.sh b/scripts/ci-test.sh index de6a6675d..996247ce0 100755 --- a/scripts/ci-test.sh +++ b/scripts/ci-test.sh @@ -24,7 +24,6 @@ make bin-ext cd ../.. # Enable apps -php occ app:enable --force viewer php occ app:enable --force memories # Run repair steps From f3264ff6d3d38e43b15e67ef33e85645430f852b Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 10 Mar 2024 23:56:00 -0700 Subject: [PATCH 4/4] e2e: use PHP 8.2 Signed-off-by: Varun Patil --- .github/workflows/e2e.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index d1993ce8d..c6148945b 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -48,7 +48,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.1'] + php-versions: ['8.2'] server-versions: ['stable28'] services: @@ -124,7 +124,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.1'] + php-versions: ['8.2'] server-versions: ['stable28'] services: @@ -205,7 +205,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.1'] + php-versions: ['8.2'] server-versions: ['stable28'] steps: