Merge remote-tracking branch 'origin/release' into dev

# Conflicts:
#	apps/cms/composer.lock
#	packages/drupal/silverback_ai/modules/silverback_image_ai/README.md
#	packages/drupal/test_content/content/node/a397ca48-8fad-411e-8901-0eba2feb989c.yml

.github/workflows/test.yml

@@ -1,6 +1,15 @@
 name: Test
 on:
   push:
+  workflow_dispatch:
+    inputs:
+      turborepo_caching:
+        description: 'Turborepo caching'
+        type: choice
+        options:
+          - 'On'
+          - 'Off'
+        default: 'On'
 
 jobs:
   test:
@@ -25,6 +34,7 @@ jobs:
         run: pnpm test:format
 
       - name: TurboRepo local server
+        if: ${{ github.event.inputs.turborepo_caching != 'Off' }}
         uses: felixmosh/turborepo-gh-artifacts@v2
         with:
           server-token: 'local'

README.md

@@ -127,67 +127,7 @@ Navigate to an app/package folder and run `pnpm dev`.
 When working on integration tasks, it may be required to re-run
 `pnpm turbo:prep` from the repo root.
 
-### Turborepo
-
-<details>
-  <summary>How it works in general</summary>
-
-Turborepo allows to cache results for scripts from `package.json` files.
-
-Minimal example:
-
-- The `build` script compiles files from `src` folder and puts the result into
-  `dist` folder
-- We can setup a Turborepo pipeline
-  ```json
-  "build": {
-    "inputs": ["src/**"],
-    "outputs": ["dist/**"]
-  }
-  ```
-- On the first `turbo build` run Turborepo will
-  - calculate hashes for files from `src` folder, and save them into cache,
-  - save `dist` folder into cache.
-- On the second `turbo build` run Turborepo will compare `src` hashes with
-  cache. If hashes do match, it will restore `dist` folder from the cache
-  without running the `build` script.
-
-More in docs: https://turbo.build/repo/docs/core-concepts/caching
-
-</details>
-
-<details>
-  <summary>Turborepo setup: local vs CI</summary>
-
-Locally, Turborepo stores caches under `node_modules/.cache/turbo` folder.
-
-In CI, the caches are saved in Github artifacts.
-
-</details>
-
-<details>
-  <summary>Debug Turborepo issues in CI</summary>
-
-It can happen that some script fails in CI because of a misconfigured Turborepo
-pipeline. The following can be used in order to debug this locally:
-
-- Setup https://github.com/ducktors/turborepo-remote-cache locally
-- Run `turborepo-remote-cache` with `TURBO_TOKEN=local pnpm dev`
-- Run tests in the target repo with
-
-  ```shell
-  # Clean the repo
-  rm -rf node_modules && git clean -dxff -e '/.turbo' -e '_local' -e '/.idea' && find . -type d -empty -delete && \
-    # Install dependencies
-    pnpm i && \
-    # Run tests with
-    # - local Turborepo server
-    # - Turborepo debug info
-    # - simulated CI
-    TURBO_API=http://0.0.0.0:3000 TURBO_TOKEN=local TURBO_TEAM=local TURBO_RUN_SUMMARY=true CI=true pnpm turbo:test
-  ```
-
-</details>
+More info on Turborepo: [docs/turborepo.md](docs/turborepo.md).
 
 ### Drupal
 

apps/cms/composer.json

@@ -32,6 +32,7 @@
     "amazeelabs/default-content": "^1.2.11",
     "amazeelabs/graphql_directives": "^2.4",
     "amazeelabs/silverback-cli": "^2.9.13",
+    "amazeelabs/silverback_ai": "^1.1",
     "amazeelabs/silverback_autosave": "^1.1",
     "amazeelabs/silverback_campaign_urls": "^1.0.5",
     "amazeelabs/silverback_cloudinary": "^1.3.0",

apps/cms/prep-database.sh

@@ -17,3 +17,17 @@ fi
 # In any case, re-import translation string.
 pnpm import-translations
 pnpm drush cr
+
+# On CI, run the content export and check if the export is up to date.
+if [ ! -z $GITHUB_ACTIONS ]; then
+  pnpm content:export
+  if [[ $(git status --porcelain) ]]; then
+    echo "Error: Content export is not up to date"
+    echo "Please run 'pnpm content:export' from apps/cms and commit the changes"
+    echo "Detected changes:"
+    git status --porcelain
+    echo "Diff:"
+    git diff
+    exit 1
+  fi
+fi

apps/cms/turbo.json

@@ -20,7 +20,7 @@
         "web/sites/default/files/**",
         "../../packages/ui/static/stories/webforms/**"
       ],
-      "env": ["CI", "LAGOON", "SKIP_DRUPAL_INSTALL"]
+      "env": ["CI", "LAGOON", "SKIP_DRUPAL_INSTALL", "GITHUB_ACTIONS"]
     },
     "prep:composer": {
       "inputs": ["composer.json", "composer.lock", "scaffold/**", "patches/**"],

docs/turborepo.md

@@ -0,0 +1,50 @@
+## How it works in general
+
+Turborepo allows to cache results for scripts from `package.json` files.
+
+Minimal example:
+
+- The `build` script compiles files from `src` folder and puts the result into
+  `dist` folder
+- We can setup a Turborepo pipeline
+  ```json
+  "build": {
+    "inputs": ["src/**"],
+    "outputs": ["dist/**"]
+  }
+  ```
+- On the first `turbo build` run Turborepo will
+  - calculate hashes for files from `src` folder, and save them into cache,
+  - save `dist` folder into cache.
+- On the second `turbo build` run Turborepo will compare `src` hashes with
+  cache. If hashes do match, it will restore `dist` folder from the cache
+  without running the `build` script.
+
+More in docs: https://turbo.build/repo/docs/core-concepts/caching
+
+## Turborepo setup: local vs CI
+
+Locally, Turborepo stores caches in `.turbo` folder.
+
+In CI, the caches are saved in Github artifacts.
+
+## Debug Turborepo issues in CI
+
+It can happen that some script fails in CI because of a misconfigured Turborepo
+pipeline. The following can be used in order to debug this locally:
+
+- Setup https://github.com/ducktors/turborepo-remote-cache locally
+- Run `turborepo-remote-cache` with `TURBO_TOKEN=local pnpm dev`
+- Run tests in the target repo with
+
+  ```shell
+  # Clean the repo
+  devbox run clean
+  # Install dependencies
+  pnpm i
+  # Run tests with
+  # - local Turborepo server
+  # - Turborepo debug info
+  # - simulated CI
+  TURBO_API=http://0.0.0.0:3000 TURBO_TOKEN=local TURBO_TEAM=local TURBO_RUN_SUMMARY=true CI=true pnpm turbo:test
+  ```