Merge pull request #1070 from pulsejet/pulsejet/ci

ci: update to stable28
pulsejet · Mar 11, 2024 · 03efdf8 · 03efdf8
2 parents 373ef5c + f3264ff
commit 03efdf8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -48,8 +48,8 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
-        server-versions: ['stable27']
+        php-versions: ['8.2']
+        server-versions: ['stable28']
 
     services:
       mysql:
@@ -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: |
@@ -116,8 +124,8 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
-        server-versions: ['stable27']
+        php-versions: ['8.2']
+        server-versions: ['stable28']
 
     services:
       postgres:
@@ -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: |
@@ -189,8 +205,8 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
-        server-versions: ['stable27']
+        php-versions: ['8.2']
+        server-versions: ['stable28']
 
     steps:
       - name: Checkout server
@@ -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/.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

diff --git 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
@@ -6,6 +6,7 @@
 
 use OCP\AppFramework\Http\TemplateResponse;
 
+/** @psalm-suppress MissingTemplateParam */
 class TemplateResponsePatch extends TemplateResponse
 {
     public function render()

diff --git 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