Merge 'main' into remixed

platformsh · May 9, 2024 · 59366ed · 59366ed
2 parents 0e7cf27 + 5de2113
commit 59366ed
Show file tree

Hide file tree

Showing 5 changed files with 13,991 additions and 14,210 deletions.
diff --git a/.github/workflows/project.yaml b/.github/workflows/project.yaml
@@ -36,6 +36,8 @@ env:
     STAGING_BRANCH: '${{ github.event.pull_request.head.ref }}$STAGING_SUFFIX'
     DEFAULT_BRANCH_CHAR_LIMIT: 28
 
+    SLEEP: 5
+
     BACKEND_PATH: "api/v1/environment"
 
     BLACKFIRE_CLIENT_ID: '${{ secrets.DEVREL_USER_BLACKFIRE_CLIENT_ID }}'
@@ -234,7 +236,7 @@ jobs:
                   cmd=$(cat frontend/src/commands.json | jq -r ".first_deploy.user.get_url") 
                   eval "$cmd"
                   URL=$(eval "$cmd --pipe")
-                  sleep 2
+                  sleep $SLEEP
                   blackfire-player run blackfire.yaml --endpoint="$URL" --variable step=branch -vvv
 
             ################################################################################################
@@ -256,7 +258,7 @@ jobs:
               working-directory: ${{ env.PROJECT_LOCALDIR }}
               run: |
                   URL=$(upsun url --primary --pipe)
-                  sleep 2
+                  sleep $SLEEP
                   blackfire-player run blackfire.yaml --endpoint="$URL" --variable step=redis -vvv
             - name: "[environment_branch] 5. Update staging environment name."
               working-directory: ${{ env.PROJECT_LOCALDIR }}
@@ -287,7 +289,7 @@ jobs:
               working-directory: ${{ env.PROJECT_LOCALDIR }}
               run: |
                   URL=$(upsun url --primary --pipe)
-                  sleep 2
+                  sleep $SLEEP
                   blackfire-player run blackfire.yaml --endpoint="$URL" --variable step=merge-production -vvv
 
             ################################################################################################
@@ -330,7 +332,7 @@ jobs:
                   git checkout ${{ steps.branch_names.outputs.default_branch }}
                   git branch
                   URL=$(upsun url -e ${{ steps.branch_names.outputs.default_branch }} --primary --pipe)
-                  sleep 2
+                  sleep $SLEEP
                   blackfire-player run blackfire.yaml --endpoint="$URL" --variable step=complete -vvv
 
             ################################################################################################
@@ -355,7 +357,7 @@ jobs:
                   git checkout ${{ steps.branch_names.outputs.default_branch }}
                   git branch
                   URL=$(upsun url -e ${{ steps.branch_names.outputs.default_branch }} --primary --pipe)
-                  sleep 2
+                  sleep $SLEEP
                   blackfire-player run blackfire.yaml --endpoint="$URL" --variable step=scale -vvv
 
             ################################################################################################

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         # These versions match Upsun support
         #   Node.js: https://docs.upsun.com/languages/nodejs.html#supported-versions
-        node-version: [18.x, 20.x, 21.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
       ################################################################################################

diff --git a/.upsun/config.yaml b/.upsun/config.yaml
@@ -9,10 +9,8 @@ applications:
         source:
             root: "frontend"
 
-        type: "nodejs:20"
-
-        build:
-            flavor: none
+        stack:
+            - "nodejs@22"
 
         variables:
             env:
@@ -52,7 +50,9 @@ applications:
 # # Step 3: Add a service. Uncomment this section.
 # ######################################################################################################################
 #         relationships:
-#             redis_session: "redis_service:redis"
+#             redis_session: 
+#                 service: "redis_service"
+#                 endpoint: "redis"
 
 # services:
 #     redis_service: