Merge branch 'master' into Valdnet-patch-1

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

Author: rakekniven

.eslintignore

@@ -6,6 +6,7 @@ node_modules/
 **/js/*
 *.config.js
 tests/lib/
+apps-extra
 
 # TODO: remove when comments files is not using handlebar templates anymore
 apps/comments/src/templates.js

.github/workflows/command-compile.yml

@@ -86,6 +86,12 @@ jobs:
           npm ci
           npm run build --if-present
 
+      - name: Build css
+        run: npm run --if-present sass
+
+      - name: Build icons css
+        run: npm run --if-present sass:icons
+
       - name: Commit and push default
         if: ${{ needs.init.outputs.arg1 != 'fixup' && needs.init.outputs.arg1 != 'amend' }}
         run: |

.github/workflows/command-rebase.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@v1
+        uses: peter-evans/create-or-update-comment@v2
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -32,12 +32,12 @@ jobs:
           token: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.5
+        uses: cirrus-actions/rebase@1.6
         env:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@v1
+        uses: peter-evans/create-or-update-comment@v2
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2']
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout

.github/workflows/node.yml

@@ -9,6 +9,7 @@ on:
   pull_request:
   push:
     branches:
+      - main
       - master
       - stable*
 
@@ -19,17 +20,17 @@ jobs:
     name: node
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.1
+        uses: skjnldsv/read-package-engines-version-actions@v1.2
         id: versions
         with:
           fallbackNode: '^12'
           fallbackNpm: '^6'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -41,6 +42,12 @@ jobs:
           npm ci
           npm run build --if-present
 
+      - name: Build css
+        run: npm run sass
+
+      - name: Build icons css
+        run: npm run sass:icons
+
       - name: Check webpack build changes
         run: |
           bash -c "[[ ! \"`git status --porcelain `\" ]] || exit 1"

.github/workflows/s3-external.yml

@@ -55,7 +55,7 @@ jobs:
           php -S localhost:8080 &
       - name: PHPUnit
         run: |
-          echo "<?php return ['run' => true,'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
+          echo "<?php return ['run' => true, 'secret' => 'actually-not-secret', 'passwordsalt' => 'actually-not-secret', 'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
           phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
           phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
       - name: S3 logs

.github/workflows/s3-primary.yml

@@ -6,7 +6,6 @@ on:
       - master
       - stable*
 
-
 jobs:
   s3-primary-tests-minio:
     runs-on: ubuntu-latest
@@ -52,9 +51,9 @@ jobs:
       - name: Wait for S3
         run: |
           sleep 10
-          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 1 http://localhost:9000/minio/health/ready
+          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready
           sleep 10
-          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 1 http://localhost:9000/minio/health/ready
+          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready
 
       - name: PHPUnit
         working-directory: tests

.github/workflows/stale.yml

@@ -27,5 +27,5 @@ jobs:
         exempt-issue-labels: '1. to develop,2. developing,3. to review,4. to release,security'
         days-before-stale: 30
         days-before-close: 14
-        debug-only: true
+        # debug-only: true
 

.github/workflows/update-psalm-baseline.yml

@@ -3,15 +3,23 @@ name: Update Psalm baseline
 on:
   workflow_dispatch:
   schedule:
-    - cron: '5 4 * * *'
+    - cron: "5 4 * * *"
 
 jobs:
   update-psalm-baseline:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        branches: ["master", "stable24", "stable23", "stable22"]
+
+    name: update-psalm-baseline-${{ matrix.branches }}
+
     steps:
       - uses: actions/checkout@v2
         with:
+          ref: ${{ matrix.branches }}
           submodules: true
 
       - name: Set up php7.4
@@ -41,10 +49,8 @@ jobs:
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
-          branch: automated/noid/psalm-baseline-update
-          # Make sure we can open multiple PRs
-          branch-suffix: timestamp
-          title: '[Automated] Update psalm-baseline.xml'
+          branch: automated/noid/${{ matrix.branches }}-update-psalm-baseline
+          title: "[${{ matrix.branches }}] Update psalm-baseline.xml"
           body: |
             Auto-generated update psalm-baseline.xml with fixed psalm warnings
           labels: |