AG-30908 Clean node_modules in the final-tasks

Merge in EXTENSIONS/browser-extension from fix/clean to master Squashed commit of the following: commit 48c7a1a Author: Maxim Topciu <[email protected]> Date: Tue Mar 5 17:23:16 2024 +0200 add size info before and after cleanup commit f6c959d Author: Maxim Topciu <[email protected]> Date: Tue Mar 5 17:16:01 2024 +0200 remove names commit bf920a8 Author: Maxim Topciu <[email protected]> Date: Tue Mar 5 17:12:10 2024 +0200 clean node_modules in the final-tasks
AdguardTeam · Mar 5, 2024 · 3af95c2 · 3af95c2
1 parent 800257c
commit 3af95c2
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 9 deletions.
diff --git a/bamboo-specs/build-beta.yaml b/bamboo-specs/build-beta.yaml
@@ -43,8 +43,6 @@ Build:
             # don't use --ignore-optional flag, because swc requires optional deps 
             yarn install --silent --ignore-engines --ignore-platform --ignore-scripts
             yarn beta
-
-            rm -rf node_modules
     - inject-variables:
         file: build/beta/build.txt
         scope: RESULT
@@ -54,6 +52,22 @@ Build:
         configuration:
           selectedRepository: defaultRepository
           tagName: v${bamboo.inject.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: build.txt
       location: build/beta

diff --git a/bamboo-specs/build-firefox-beta.yaml b/bamboo-specs/build-firefox-beta.yaml
@@ -52,15 +52,26 @@ Build:
             FIREFOX_CLIENT_ID="${bamboo_firefoxAmoClientId}" \
             FIREFOX_CLIENT_SECRET="${bamboo_firefoxAmoClientSecret}" \
             go-webext -v sign firefox -f 'firefox.zip' -s 'source.zip' -o 'firefox.xpi'
-
-            # Return to the previous directory
-            cd -
-
-            rm -rf node_modules
     - inject-variables:
         file: build/beta/build.txt
         scope: RESULT
         namespace: inject
+  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: build.txt
       location: build/beta

diff --git a/bamboo-specs/build-release.yaml b/bamboo-specs/build-release.yaml
@@ -44,8 +44,6 @@ Build:
 
             # zip source files for publishing on AMO
             git ls-files | zip -@ build/release/source.zip
-
-            rm -rf node_modules
     - inject-variables:
         file: build/release/build.txt
         scope: RESULT
@@ -55,6 +53,22 @@ Build:
         configuration:
           selectedRepository: defaultRepository
           tagName: v${bamboo.inject.version}
+  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: build.txt
       location: build/release

diff --git a/bamboo-specs/tests.yaml b/bamboo-specs/tests.yaml
@@ -35,11 +35,27 @@ Test:
 
             # don't use --ignore-optional flag, because esbuild requires optional deps 
             yarn install --silent --ignore-engines --ignore-platform --ignore-scripts
+            
             yarn lint --max-warnings=0
             yarn check-types
             yarn test
             yarn dev
+  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: build.txt
       location: build/dev