AG-30908 clean node_modules

Merge in EXTENSIONS/popup-blocker from fix/AG-30908 to master Squashed commit of the following: commit 65ae68432535e2406befb5ea3e263043f45637c4 Author: Stanislav Atroschenko <s.atroschenko@adguard.com> Date: Tue Mar 5 21:08:20 2024 +0300 AG-30908 clean node_modules
AdguardTeam · Mar 5, 2024 · f6a396b · f6a396b
1 parent c752c49
commit f6a396b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/bamboo-specs/build-beta.yaml b/bamboo-specs/build-beta.yaml
@@ -36,7 +36,6 @@ Build:
             yarn install ${bamboo.varsYarn}
             yarn userscript-beta
             tar -C build -zcvf build/userscript.tar.gz userscript
-            rm -rf node_modules
     - inject-variables:
         file: build/build.txt
         scope: RESULT
@@ -46,6 +45,22 @@ Build:
         configuration:
           selectedRepository: defaultRepository
           tagName: v${bamboo.userscriptMeta.version}-beta
+  final-tasks:
+      - 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
   artifacts:
     - name: userscript.tar.gz
       location: build

diff --git a/bamboo-specs/build-release.yaml b/bamboo-specs/build-release.yaml
@@ -40,7 +40,6 @@ Build:
             yarn install ${bamboo.varsYarn}
             yarn userscript-release
             tar -C build -zcvf build/userscript.tar.gz userscript
-            rm -rf node_modules
     - inject-variables:
         file: build/build.txt
         scope: RESULT
@@ -50,6 +49,22 @@ Build:
         configuration:
           selectedRepository: defaultRepository
           tagName: v${bamboo.userscriptMeta.version}-release
+  final-tasks:
+      - 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
   artifacts:
     - name: userscript.tar.gz
       location: build

diff --git a/bamboo-specs/tests.yaml b/bamboo-specs/tests.yaml
@@ -36,7 +36,22 @@ Test:
             yarn lint
             yarn userscript-dev
             tar -C build -zcvf build/userscript.tar.gz userscript
-            rm -rf node_modules
+  final-tasks:
+      - 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
   artifacts:
     - name: userscript.tar.gz
       location: build