Merge remote-tracking branch 'origin/main' into mtxs-hana-troubleshooting

Author: ecklie

.github/cli/grab-cli-texts.js

@@ -20,11 +20,14 @@ const toOutput = (str) => [
     `> ${cmd}`,
     '',
     str
-        .replace(/\n.*home.*[|:].*/g, '') // remove absolute cds home path as it's system-specific
+        .replace(/([\S]+)\/node_modules/g, '.../node_modules') // remove system-specific paths
+        .replace(/([\S]+)\/bin\/node/g, '.../bin/node')
+        .replace(/([\S]+)\/your-project/g, '.../your-project') // sample project path
         .replace(/\<(.*?)\>/g, '&lt;$1&gt;') // <foo> -> &lt;foo&gt;
-        .replace(/^\x1b\[1m(.*?)\x1b\[(:?0|39|49)m\n/gm, '<strong>$1</strong>') // bold at beginning of line -> strong
-        .replace(/(\s*)\x1b\[4m(.*?)\x1b\[(:?0|39|49)m/g, '$1<i>$2</i>') // underline -> i
-        .replace(/(\s*)\x1b\[\d+m(.*?)\x1b\[(:?0|39|49)m/g, '$1<em>$2</em>') // other colors -> em
+        .replace(/^\x1b\[1m(.*?)\x1b\[(?:0|39|49)m\n/gm, '<strong>$1</strong>') // bold at beginning of line -> strong
+        .replace(/(\s*)\x1b\[(?:2|4)m(.*?)\x1b\[(?:0|39|49)m/g, '$1<i>$2</i>') // underline or grey -> i
+        .replace(/(\s*)\x1b\[[1-9]+m(.*?)\x1b\[(?:0|32|33|39|49)m/g, '$1<em>$2</em>') // other colors -> em
+        .replace(/\x1b\[0m/g, '') // remove all remaining resets
     ,
     `</pre>`
 ].join('\n')

.github/workflows/PR-SAP.yml

@@ -2,7 +2,6 @@ name: PR Build (SAP)
 
 on:
   pull_request:
-    branches: [main]
   merge_group:
 
 concurrency:

.github/workflows/update-content.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '22'
+          node-version: 24
 
       - name: Extract CLI texts
         run: |
@@ -51,12 +51,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '22'
+          node-version: 24
 
       - name: Update Java Properties
         run: |

cds/assets/cxl/expr.drawio.svg

@@ -240,9 +240,6 @@ This syntax diagram describes the possible expressions:
   ]
   ```
 
-  Compared to the previous example, we now use the expression directly in the query
-  to calculate the total value of all books in stock.
-
   ```sql [SQL]
   SELECT
     Books.title,
@@ -254,6 +251,8 @@ This syntax diagram describes the possible expressions:
   ```
   :::
 
+Compared to the previous example, we now use the expression directly in the query
+to calculate the total value of all books in stock.
 
 
 ## Path Expressions (`ref`)