Merge branch 'main' of github.com:QuentinLemCode/recognize into switch-human

Author: QuentinLemCode

.github/workflows/cluster-faces-test.yml

@@ -140,21 +140,21 @@ jobs:
         id: photos-cache
         with:
           path: data/admin/files/
-          key: https://cloud.marcelklehr.de/s/PkNYbmKnwMiQMFD/download/IMDb-Face.zip
+          key: https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face.zip
 
       - name: Upload photos
         if: steps.photos-cache.outputs.cache-hit != 'true'
         run: |
           mkdir -p data/admin/files/
           cd data/admin/files
-          wget https://cloud.marcelklehr.de/s/PkNYbmKnwMiQMFD/download/IMDb-Face.zip
+          wget https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face.zip
           unzip IMDb-Face.zip
           rm IMDb-Face.zip
 
       - uses: actions/cache/save@v3
         with:
           path: data/admin/files/
-          key: https://cloud.marcelklehr.de/s/PkNYbmKnwMiQMFD/download/IMDb-Face.zip
+          key: https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face.zip
 
       - name: Set config
         run: |
@@ -259,7 +259,7 @@ jobs:
       - name: Download IMDb-Face.csv
         working-directory: apps/${{ env.APP_NAME }}/tests/res
         run: |
-          wget https://cloud.marcelklehr.de/s/ZKe7MY7gZRRxBPq/download/IMDb-Face-csv.zip 
+          wget https://cloud.nextcloud.com/s/4JqQdPy3dicQRPr/download/IMDb-Face-csv.zip 
           unzip IMDb-Face-csv.zip
           rm IMDb-Face-csv.zip
 

.github/workflows/psalm-matrix.yml

@@ -21,34 +21,27 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest-low
-    outputs:
-      ocp-matrix: ${{ steps.versions.outputs.ocp-matrix }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
-
   static-analysis:
     runs-on: ubuntu-latest
-    needs: matrix
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix: ${{ fromJson(needs.matrix.outputs.ocp-matrix) }}
 
-    name: static-psalm-analysis ${{ matrix.ocp-version }}
+    name: static-psalm-analysis
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: Get php version
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
 
-      - name: Set up php${{ matrix.php-versions }}
+      - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
+        run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
+
+      - name: Set up php${{ steps.versions.outputs.php-available }}
         uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: ${{ steps.versions.outputs.php-available }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
@@ -60,21 +53,8 @@ jobs:
           composer remove nextcloud/ocp --dev
           composer i
 
-
-      - name: Install dependencies
-        run: composer require --dev 'nextcloud/ocp:${{ matrix.ocp-version }}' --ignore-platform-reqs --with-dependencies
+      - name: Install nextcloud/ocp
+        run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
 
       - name: Run coding standards check
-        run: composer run psalm
-
-  summary:
-    runs-on: ubuntu-latest-low
-    needs: static-analysis
-
-    if: always()
-
-    name: static-psalm-analysis-summary
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi
+        run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github

appinfo/info.xml

@@ -76,7 +76,7 @@ Requirements:
 The app does not send any sensitive data to cloud providers or similar services. All processing is done on your Nextcloud machine, using Tensorflow.js running in Node.js.
 
 ]]></description>
-	<version>9.0.0-dev.0</version>
+	<version>10.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]">Marcel Klehr</author>
 	<types>
@@ -92,7 +92,7 @@ The app does not send any sensitive data to cloud providers or similar services.
 	<screenshot>https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/Logo.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/imagenet_examples.jpg</screenshot>
 	<dependencies>
-		<nextcloud min-version="31" max-version="31" />
+		<nextcloud min-version="32" max-version="32" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Recognize\BackgroundJobs\MaintenanceJob</job>

l10n/da.js

@@ -30,7 +30,7 @@ OC.L10N.register(
     "Pizza" : "Pizza",
     "Info" : "Info",
     "Document" : "Dokument",
-    "Bucket" : "Bucket",
+    "Bucket" : "Spand",
     "Festival" : "Festival",
     "Event" : "Begivenhed",
     "Gallery" : "Galleri",

l10n/da.json

@@ -28,7 +28,7 @@
     "Pizza" : "Pizza",
     "Info" : "Info",
     "Document" : "Dokument",
-    "Bucket" : "Bucket",
+    "Bucket" : "Spand",
     "Festival" : "Festival",
     "Event" : "Begivenhed",
     "Gallery" : "Galleri",