Skip to content

Commit b4a53be

Browse files
committed
AG-30908 clean node_modules
Merge in ADGUARD-FILTERS/vscode-adblock-syntax from fix/AG-30908 to master Squashed commit of the following: commit 1971b05 Author: scripthunter7 <d.tota@adguard.com> Date: Wed Mar 6 15:03:32 2024 +0100 cleanup second deploy commit f180365 Author: scripthunter7 <d.tota@adguard.com> Date: Wed Mar 6 15:03:05 2024 +0100 add comment commit 86606c3 Author: scripthunter7 <d.tota@adguard.com> Date: Wed Mar 6 15:01:08 2024 +0100 clean node_modules
1 parent 3bd2d17 commit b4a53be

3 files changed

Lines changed: 86 additions & 10 deletions

File tree

bamboo-specs/build.yaml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ Build:
7272
7373
# Create build.txt file with version
7474
yarn build:txt
75-
76-
# Cleanup
77-
rm -rf node_modules
78-
rm -rf client/node_modules
79-
rm -rf server/node_modules
8075
- inject-variables:
8176
file: out/build.txt
8277
scope: RESULT
@@ -86,6 +81,31 @@ Build:
8681
configuration:
8782
selectedRepository: defaultRepository
8883
tagName: v${bamboo.inject.version}
84+
final-tasks:
85+
- script:
86+
interpreter: SHELL
87+
scripts:
88+
- |-
89+
set -x
90+
set -e
91+
92+
# Fix mixed logs
93+
exec 2>&1
94+
95+
ls -la
96+
97+
echo "Size before cleanup:" && du -h | tail -n 1
98+
99+
# cleanup root directory
100+
rm -rf node_modules
101+
102+
# cleanup client directory
103+
rm -rf client/node_modules
104+
105+
# cleanup server directory
106+
rm -rf server/node_modules
107+
108+
echo "Size after cleanup:" && du -h | tail -n 1
89109
# Store the .vsix file as a build artifact
90110
artifacts:
91111
- name: vscode-adblock.vsix

bamboo-specs/deploy.yaml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,28 @@ marketplace.visualstudio.com:
4242
4343
# https://code.visualstudio.com/api/working-with-extensions/publishing-extension#publish-an-extension
4444
yarn vsce publish -p ${bamboo.vsceToken} -i vscode-adblock.vsix
45+
final-tasks:
46+
- script:
47+
interpreter: SHELL
48+
scripts:
49+
- |-
50+
set -x
51+
set -e
52+
53+
# Fix mixed logs
54+
exec 2>&1
55+
56+
ls -la
4557
46-
# Cleanup
58+
echo "Size before cleanup:" && du -h | tail -n 1
59+
60+
# cleanup root directory
61+
# note: no need to clean client and server directories here, because we only installed
62+
# dependencies in the root directory (for the vsce publish command above)
63+
# TODO: switch to yarn workspaces
4764
rm -rf node_modules
65+
66+
echo "Size after cleanup:" && du -h | tail -n 1
4867
requirements:
4968
- adg-docker: 'true'
5069
notifications:
@@ -89,9 +108,28 @@ open-vsx.org:
89108
90109
# https://github.com/eclipse/openvsx/wiki/Publishing-Extensions#5-package-and-upload
91110
yarn ovsx publish vscode-adblock.vsix -p ${bamboo.openVsxToken}
111+
final-tasks:
112+
- script:
113+
interpreter: SHELL
114+
scripts:
115+
- |-
116+
set -x
117+
set -e
118+
119+
# Fix mixed logs
120+
exec 2>&1
121+
122+
ls -la
92123
93-
# Cleanup
124+
echo "Size before cleanup:" && du -h | tail -n 1
125+
126+
# cleanup root directory
127+
# note: no need to clean client and server directories here, because we only installed
128+
# dependencies in the root directory (for the vsce publish command above)
129+
# TODO: switch to yarn workspaces
94130
rm -rf node_modules
131+
132+
echo "Size after cleanup:" && du -h | tail -n 1
95133
requirements:
96134
- adg-docker: 'true'
97135
notifications:

bamboo-specs/test.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,31 @@ Build:
6464
6565
# Run Jest tests
6666
yarn test
67+
final-tasks:
68+
- script:
69+
interpreter: SHELL
70+
scripts:
71+
- |-
72+
set -x
73+
set -e
6774
68-
# Cleanup
75+
# Fix mixed logs
76+
exec 2>&1
77+
78+
ls -la
79+
80+
echo "Size before cleanup:" && du -h | tail -n 1
81+
82+
# cleanup root directory
6983
rm -rf node_modules
84+
85+
# cleanup client directory
7086
rm -rf client/node_modules
87+
88+
# cleanup server directory
7189
rm -rf server/node_modules
72-
final-tasks:
73-
- clean
90+
91+
echo "Size after cleanup:" && du -h | tail -n 1
7492
requirements:
7593
- adg-docker: true
7694

0 commit comments

Comments
 (0)