Merge branch '3.3' into feat/keycloak-25

api-platform · Sep 15, 2024 · 106bbec · 106bbec
2 parents ce56fbb + 7e88f29
commit 106bbec
Show file tree

Hide file tree

Showing 10 changed files with 430 additions and 399 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -66,9 +66,15 @@ jobs:
             compose.yaml
             compose.prod.yaml
           set: |
-            *.cache-from=type=gha,scope=${{ github.ref }}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            php.cache-from=type=gha,scope=${{ github.ref }}
+            php.cache-from=type=gha,scope=refs/heads/main
+            php.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            pwa.cache-from=type=gha,scope=${{ github.ref }}
+            pwa.cache-from=type=gha,scope=refs/heads/main
+            pwa.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}
+            keycloak.cache-from=type=gha,scope=refs/heads/main
+            keycloak.cache-to=type=gha,scope=${{ github.ref }},mode=max
       -
         name: Docker push
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,9 +39,15 @@ jobs:
             compose.yaml
             compose.override.yaml
           set: |
-            *.cache-from=type=gha,scope=${{ github.ref }}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            php.cache-from=type=gha,scope=${{ github.ref }}
+            php.cache-from=type=gha,scope=refs/heads/main
+            php.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            pwa.cache-from=type=gha,scope=${{ github.ref }}
+            pwa.cache-from=type=gha,scope=refs/heads/main
+            pwa.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}
+            keycloak.cache-from=type=gha,scope=refs/heads/main
+            keycloak.cache-to=type=gha,scope=${{ github.ref }},mode=max
       -
         name: Start services
         run: docker compose up --wait --no-build
@@ -130,10 +136,18 @@ jobs:
             compose.yaml
             compose.prod.yaml
           set: |
-            *.cache-from=type=gha,scope=${{ github.ref }}-e2e
-            *.cache-from=type=gha,scope=${{ github.ref }}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
+            php.cache-from=type=gha,scope=${{ github.ref }}-e2e
+            php.cache-from=type=gha,scope=${{ github.ref }}
+            php.cache-from=type=gha,scope=refs/heads/main
+            php.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
+            pwa.cache-from=type=gha,scope=${{ github.ref }}-e2e
+            pwa.cache-from=type=gha,scope=${{ github.ref }}
+            pwa.cache-from=type=gha,scope=refs/heads/main
+            pwa.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}-e2e
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}
+            keycloak.cache-from=type=gha,scope=refs/heads/main
+            keycloak.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
       -
         name: Start Services
         run: docker compose up --wait --no-build
@@ -229,7 +243,7 @@ jobs:
       -
         name: Get API changed files
         id: api-changed-files
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@v45
         with:
           files: api/**/*.php
       -

diff --git a/api/composer.json b/api/composer.json
@@ -5,7 +5,7 @@
         "php": ">=8.3",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "api-platform/core": "^4.0@alpha",
+        "api-platform/core": "^3.3",
         "doctrine/common": "^3.4",
         "doctrine/doctrine-bundle": "^2.11",
         "doctrine/doctrine-fixtures-bundle": "^3.5",