update, format bamboo specs

AdguardTeam · Apr 26, 2024 · 62f66e1 · 62f66e1
1 parent 1864990
commit 62f66e1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 23 deletions.
diff --git a/bamboo-specs/bamboo.yaml b/bamboo-specs/bamboo.yaml
@@ -1,14 +1,10 @@
 ---
 !include 'test.yaml'
-
 ---
 !include 'increment.yaml'
-
 ---
 !include 'build.yaml'
-
 ---
 !include 'deploy.yaml'
-
 ---
 !include 'permissions.yaml'
diff --git a/bamboo-specs/build.yaml b/bamboo-specs/build.yaml
@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXBUILD
   name: vscode adblock syntax - build release
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:21.7--1
 
 stages:
   - Build:
@@ -21,7 +21,7 @@ Build:
   docker:
     image: ${bamboo.dockerNode}
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   tasks:
     - checkout:
         force-clean-build: true
@@ -95,7 +95,7 @@ Build:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             rm -rf node_modules
 
@@ -104,7 +104,7 @@ Build:
 
             # cleanup server directory
             rm -rf server/node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   # Store the .vsix file as a build artifact
   artifacts:

diff --git a/bamboo-specs/deploy.yaml b/bamboo-specs/deploy.yaml
@@ -10,9 +10,9 @@ environments:
 
 marketplace.visualstudio.com:
   docker:
-    image: adguard/node-ssh:18.13--1
+    image: adguard/node-ssh:21.7--1
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   triggers: []
   tasks:
     - checkout:
@@ -56,13 +56,13 @@ marketplace.visualstudio.com:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             # note: no need to clean client and server directories here, because we only installed
             #       dependencies in the root directory (for the vsce publish command above)
             # TODO: switch to yarn workspaces
             rm -rf node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   requirements:
     - adg-docker: 'true'
@@ -78,7 +78,7 @@ open-vsx.org:
   docker:
     image: adguard/node-ssh:18.13--1
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   triggers: []
   tasks:
     - checkout:
@@ -122,13 +122,13 @@ open-vsx.org:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             # note: no need to clean client and server directories here, because we only installed
             #       dependencies in the root directory (for the vsce publish command above)
             # TODO: switch to yarn workspaces
             rm -rf node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   requirements:
     - adg-docker: 'true'

diff --git a/bamboo-specs/increment.yaml b/bamboo-specs/increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXINCR
   name: vscode adblock syntax - increment
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:21.7--1
 
 stages:
   - Increment:
@@ -17,9 +17,9 @@ stages:
 Increment:
   key: INCR
   docker:
-    image: "${bamboo.dockerNode}"
+    image: '${bamboo.dockerNode}'
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   other:
     clean-working-dir: true
   tasks:

diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@ plan:
   key: VSCODEADBLOCKSYNTAXTEST
   name: vscode adblock syntax - tests
 variables:
-  dockerNode: adguard/node-ssh:18.13--1
+  dockerNode: adguard/node-ssh:21.7--1
 
 stages:
   - Build:
@@ -17,9 +17,9 @@ stages:
 Build:
   key: BUILD
   docker:
-    image: "${bamboo.dockerNode}"
+    image: '${bamboo.dockerNode}'
     volumes:
-      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+      ${system.YARN_DIR}: '${bamboo.cacheYarn}'
   tasks:
     - checkout:
         force-clean-build: true
@@ -78,7 +78,7 @@ Build:
             ls -la
 
             echo "Size before cleanup:" && du -h | tail -n 1
-            
+
             # cleanup root directory
             rm -rf node_modules
 
@@ -87,7 +87,7 @@ Build:
 
             # cleanup server directory
             rm -rf server/node_modules
-  
+
             echo "Size after cleanup:" && du -h | tail -n 1
   requirements:
     - adg-docker: true