Merge branch 'master' into automated/update-workflows/default

Signed-off-by: Andy Scherzinger <[email protected]>
nextcloud · Mar 21, 2024 · bf4d1a1 · bf4d1a1
2 parents 7d40ef0 + d0b3039
commit bf4d1a1
Show file tree

Hide file tree

Showing 110 changed files with 1,280 additions and 139 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -71,7 +71,7 @@ jobs:
           - 4444:3306/tcp
         env:
           MYSQL_ROOT_PASSWORD: rootpassword
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
 
     steps:
       - name: Set app env
@@ -109,7 +109,7 @@ jobs:
 
       - name: Check composer file existence
         id: check_composer
-        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v2
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
         with:
           files: apps/${{ env.APP_NAME }}/composer.json
 

diff --git a/composer.lock b/composer.lock
diff --git a/js/photos-dashboard.js b/js/photos-dashboard.js