Merge branch '4.x' into 7068-update-contact-updated-at-when-listed

monicahq · May 4, 2024 · ef63da7 · ef63da7
2 parents 51e1733 + 498c6ea
commit ef63da7
Show file tree

Hide file tree

Showing 16 changed files with 2,774 additions and 2,134 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,8 +12,8 @@ on:
     types: [completed]
 
 env:
-  php-version: '8.1'
-  node-version: 18
+  php-version: '8.2'
+  node-version: 20
 
 concurrency:
   group: Build ${{ github.ref }}

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -5,7 +5,7 @@ on:
     types: [labeled, opened, synchronize, reopened]
 
 env:
-  node-version: 18
+  node-version: 20
 
 concurrency:
   group: Cypress tests ${{ github.ref }}
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
         browser: [chrome]
         containers: [1, 2, 3, 4, 5, 6, 7, 8]
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -14,8 +14,8 @@ on:
   workflow_dispatch:
 
 env:
-  php-version: '8.1'
-  node-version: 18
+  php-version: '8.2'
+  node-version: 20
 
 concurrency:
   group: Deploy ${{ github.ref }}
@@ -188,7 +188,7 @@ jobs:
       - name: Deploy
         run: |
           git remote add deploy $REPO_URL
-          git push deploy main:master --force
+          git push deploy HEAD:master --force
         env:
           # This avoids a failure when the client does not know the SSH Host already
           GIT_SSH_COMMAND: "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,10 +4,11 @@ on:
   push:
     branches:
       - main
+      - 4.x
 
 env:
-  php-version: '8.1'
-  node-version: 18
+  php-version: '8.2'
+  node-version: 20
 
 concurrency:
   group: Docker ${{ github.ref }}
@@ -32,7 +33,8 @@ jobs:
         uses: crazy-max/ghaction-docker-meta@v4
         with:
           images: ghcr.io/monicahq/monica
-          tag-sha: true
+          tags: |
+            type=sha
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

diff --git a/.github/workflows/migration_tests.yml b/.github/workflows/migration_tests.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
         connection: [mysql]
 
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,13 +9,14 @@ on:
       - next-major
       - beta
       - alpha
+      - 4.x
 
   workflow_dispatch:
 
 env:
-  php-version: '8.1'
-  build-node-version: 18
-  semantic-node-version: 18
+  php-version: '8.2'
+  build-node-version: 20
+  semantic-node-version: 20
 
 jobs:
   ####################
@@ -42,17 +43,16 @@ jobs:
           node-version: ${{ env.semantic-node-version }}
 
       - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v3
+        uses: cycjimmy/semantic-release-action@v4
         id: semantic
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_TOKEN_RELEASE: ${{ secrets.GH_TOKEN_RELEASE }}
         with:
-          semantic_version: 19
+          semantic_version: 23
           extra_plugins: |
-            conventional-changelog-conventionalcommits@5.0.0
+            conventional-changelog-conventionalcommits@7
             @semantic-release/changelog@6
-            semantic-release-github-pullrequest
 
       - name: New release published
         if: steps.semantic.outputs.new_release_published == 'true'
@@ -164,4 +164,5 @@ jobs:
         with:
           workflow: Release update
           repo: monicahq/docker
+          ref: refs/heads/main
           token: ${{ secrets.DOCKER_GITHUB_TOKEN }}
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -4,16 +4,16 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
-  workflow_run:
-    workflows: ['Compress images']
-    types: [completed]
+#   workflow_run:
+#     workflows: ['Compress images']
+#     types: [completed]
 
 env:
-  php-version: '8.1'
+  php-version: '8.2'
 
-concurrency:
-  group: Static analysis ${{ github.ref }}
-  cancel-in-progress: true
+# concurrency:
+#   group: Static analysis ${{ github.ref }}
+#   cancel-in-progress: true
 
 jobs:
   psalm:
@@ -22,31 +22,31 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Setup PHP ${{ env.php-version }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: redis
-          coverage: none
+#       - name: Setup PHP ${{ env.php-version }}
+#         uses: shivammathur/setup-php@v2
+#         with:
+#           php-version: ${{ env.php-version }}
+#           extensions: redis
+#           coverage: none
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - name: Cache composer files
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
-            ${{ runner.os }}-composer-${{ env.php-version }}
-            ${{ runner.os }}-composer-
+#       - name: Get Composer Cache Directory
+#         id: composer-cache
+#         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+#       - name: Cache composer files
+#         uses: actions/cache@v3
+#         with:
+#           path: ${{ steps.composer-cache.outputs.dir }}
+#           key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
+#           restore-keys: |
+#             ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
+#             ${{ runner.os }}-composer-${{ env.php-version }}
+#             ${{ runner.os }}-composer-
 
-      - name: Install dependencies
-        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+#       - name: Install dependencies
+#         run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: Run psalm
-        run: vendor/bin/psalm --output-format=github
+#       - name: Run psalm
+#         run: vendor/bin/psalm --output-format=github
 
 
   phpstan:
@@ -55,28 +55,28 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Setup PHP ${{ env.php-version }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: redis
-          coverage: none
+#       - name: Setup PHP ${{ env.php-version }}
+#         uses: shivammathur/setup-php@v2
+#         with:
+#           php-version: ${{ env.php-version }}
+#           extensions: redis
+#           coverage: none
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - name: Cache composer files
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
-            ${{ runner.os }}-composer-${{ env.php-version }}
-            ${{ runner.os }}-composer-
+#       - name: Get Composer Cache Directory
+#         id: composer-cache
+#         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+#       - name: Cache composer files
+#         uses: actions/cache@v3
+#         with:
+#           path: ${{ steps.composer-cache.outputs.dir }}
+#           key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
+#           restore-keys: |
+#             ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
+#             ${{ runner.os }}-composer-${{ env.php-version }}
+#             ${{ runner.os }}-composer-
 
-      - name: Install dependencies
-        run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+#       - name: Install dependencies
+#         run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: Run phpstan
-        run: vendor/bin/phpstan analyse
+#       - name: Run phpstan
+#         run: vendor/bin/phpstan analyse
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,7 +2,9 @@ name: Unit tests
 
 on:
   push:
-    branches: [main]
+    branches: 
+      - main
+      - 4.x
   pull_request:
     types: [opened, synchronize, reopened]
     branches-ignore: ['l10n_main*']
@@ -14,8 +16,8 @@ on:
     types: [completed]
 
 env:
-  default-php-version: '8.1'
-  node-version: 18
+  default-php-version: '8.2'
+  node-version: 20
 
 concurrency:
   group: Unit tests ${{ github.ref }}
@@ -32,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
         connection: [mysql]
         testsuite: [Api, Feature, Commands-Other, Commands-Scheduling, Unit-Models, Unit-Services]
         # exclude:
@@ -152,7 +154,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1']
+        php-version: ['8.2']
         connection: [mysql]
 
     steps:

diff --git a/.releaserc b/.releaserc
@@ -1,6 +1,7 @@
 {
   "branches": [
     "main",
+    "4.x",
     "next",
     "next-major",
     {"name": "beta", "prerelease": true},
@@ -32,13 +33,6 @@
         "changelogFile": "CHANGELOG.md"
       }
     ],
-    "@semantic-release/github",
-    [
-      "semantic-release-github-pullrequest",
-      {
-        "assets": ["CHANGELOG.md"],
-        "labels": ["semantic-release", "auto-squash"]
-      }
-    ]
+    "@semantic-release/github"
   ]
 }
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "ext-intl": "*",
         "ext-redis": "*",
         "asbiin/laravel-adorable": "^1.0",
-        "asbiin/laravel-webauthn": "^3.0",
+        "asbiin/laravel-webauthn": "^4.0",
         "bacon/bacon-qr-code": "^2.0",
         "creativeorange/gravatar": "^1.0",
         "doctrine/dbal": "^3.0",
@@ -31,7 +31,7 @@
         "laravel/socialite": "^5.0",
         "laravel/ui": "^4.0",
         "laravolt/avatar": "^4.0",
-        "lcobucci/clock": "3.0.0",
+        "lcobucci/clock": "^3.0.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "mariuzzo/laravel-js-localization": "^1.7",
         "matriphe/iso-639": "^1.0",