Merge branch 'master' into fix/AG-48295-01

Author: slvvko

bamboo-specs/build.yaml

@@ -53,18 +53,7 @@ Build:
     - script:
         interpreter: SHELL
         scripts:
-          - |-
-            set -x
-            set -e
-
-            # Fix mixed logs
-            exec 2>&1
-
-            ls -la
-
-            echo "Size before cleanup:" && du -h | tail -n 1
-            rm -rf node_modules
-            echo "Size after cleanup:" && du -h | tail -n 1
+          - "./bamboo-specs/scripts/cleanup.sh scriptlets.tgz"
   artifacts:
     - name: scriptlets.tgz
       location: .

bamboo-specs/increment.yaml

@@ -48,6 +48,11 @@ Increment:
         configuration:
           commitMessage: 'skipci: Automatic increment build number'
           selectedRepository: defaultRepository
+  final-tasks:
+    - script:
+        interpreter: SHELL
+        scripts:
+          - "./bamboo-specs/scripts/cleanup.sh"
   requirements:
     - adg-docker: 'true'
 

bamboo-specs/scripts/cleanup.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Cleanup script that preserves specified artifacts
+# Usage: ./cleanup.sh "artifact1,artifact2,artifact3"
+
+# 'set' should be added to the beginning of each script to ensure that it runs with the correct options.
+# Please do not move it to some common file, like `setup-tests.sh`, because sourcing A script from B script
+# cannot change the options of B script.
+# -e: Exit immediately if any command exits with a non-zero status (i.e., if a command fails).
+# -x: Print each command to the terminal as it is executed, which is useful for debugging.
+set -ex
+
+# Fix mixed logs
+exec 2>&1
+
+echo "Size before cleanup:" && du -h | tail -n 1
+echo "Top 5 files:" && du -h | sort -hr | head -n 5
+
+# Parse artifacts from command line argument
+ARTIFACTS_ARG="${1:-}"
+if [ -z "$ARTIFACTS_ARG" ]; then
+  echo "No artifacts specified, cleaning entire workspace"
+  ARTIFACTS=""
+else
+  # Convert comma-separated string to space-separated
+  ARTIFACTS=$(echo "$ARTIFACTS_ARG" | tr ',' ' ')
+  echo "Preserving artifacts: $ARTIFACTS"
+fi
+
+TMP="$(mktemp -d)"
+trap 'rm -rf "$TMP"' EXIT
+
+# Stash artifacts to /tmp
+for f in $ARTIFACTS; do
+  [ -e "$f" ] || continue
+  echo "Stashing artifact: $f"
+  mkdir -p "$TMP/$(dirname "$f")"
+  mv "$f" "$TMP/$f"
+done
+
+# Clean entire workspace (including dotfiles and .git)
+find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +
+
+# Restore artifacts
+for f in $ARTIFACTS; do
+  [ -e "$TMP/$f" ] || continue
+  echo "Restoring artifact: $f"
+  mkdir -p "$(dirname "$f")"
+  mv "$TMP/$f" "$f"
+done
+
+echo "Size after cleanup:" && du -h | tail -n 1
+echo "Top 5 files:" && du -h | sort -hr | head -n 5
+
+echo "Cleanup completed successfully"

bamboo-specs/test.yaml

@@ -22,11 +22,6 @@ stages:
         - Test smoke
         # lint should be run after building of docs and lib
         - Lint
-  - Cleanup:
-      <<: *stage
-      final: true
-      jobs:
-        - Cleanup
 
 Build docs:
   key: BUILDDOCS
@@ -64,6 +59,11 @@ Build docs:
             # build docs to lint them later
             # check compatibility table updates and build it and build wiki docs
             pnpm wiki
+  final-tasks:
+    - script: &cleanup-script
+        interpreter: SHELL
+        scripts:
+          - "./bamboo-specs/scripts/cleanup.sh"
   requirements: &requirements
     - adg-docker: 'true'
     - extension: 'true'
@@ -89,6 +89,11 @@ Build lib:
       location: dist
       pattern: redirects.json
       required: true
+  final-tasks:
+    - script:
+        interpreter: SHELL
+        scripts:
+          - "./bamboo-specs/scripts/cleanup.sh dist/scriptlets.corelibs.json,dist/redirects.json"
   requirements: *requirements
 
 Test qunit:
@@ -103,6 +108,8 @@ Test qunit:
         scripts:
           - |-
             pnpm test:qunit
+  final-tasks:
+    - script: *cleanup-script
   requirements: *requirements
 
 Test vitest:
@@ -116,6 +123,8 @@ Test vitest:
         scripts:
           - |-
             pnpm test:vitest
+  final-tasks:
+    - script: *cleanup-script
   requirements: *requirements
 
 Test smoke:
@@ -130,6 +139,8 @@ Test smoke:
         scripts:
           - |-
             pnpm test:smoke
+  final-tasks:
+    - script: *cleanup-script
   requirements: *requirements
 
 Lint:
@@ -143,28 +154,8 @@ Lint:
         scripts:
           - |-
             pnpm lint
-  requirements: *requirements
-
-Cleanup:
-  key: CLEAN
-  docker: *docker
-  tasks:
-    - checkout
-    - script:
-        interpreter: SHELL
-        scripts:
-          - |-
-            set -x
-            set -e
-
-            # Fix mixed logs
-            exec 2>&1
-
-            ls -la
-
-            echo "Size before cleanup:" && du -h | tail -n 1
-            rm -rf node_modules
-            echo "Size after cleanup:" && du -h | tail -n 1
+  final-tasks:
+    - script: *cleanup-script
   requirements: *requirements
 
 branches:

scripts/compatibility-table.json

@@ -594,6 +594,9 @@
         },
         {
             "ubo": "noop-0.5s.mp3"
+        },
+        {
+            "ubo": "sensors-analytics.js"
         }
     ]
 }

wiki/compatibility-table.md

@@ -182,3 +182,4 @@
 |  | outbrain-widget.js |  |
 |  | noeval.js |  |
 |  | noop-0.5s.mp3 |  |
+|  | sensors-analytics.js |  |