Refactor deploy specs

Merge in ADGUARD-FILTERS/vscode-adblock-syntax from fix/remove-yarn-clean-from-specs to master Squashed commit of the following: commit 922d6a0 Author: scripthunter7 <[email protected]> Date: Fri Nov 10 14:41:59 2023 +0100 Update docker image version commit 0806b94 Author: scripthunter7 <[email protected]> Date: Fri Nov 10 14:29:13 2023 +0100 Consistent docker versions commit 0c2e0f0 Author: scripthunter7 <[email protected]> Date: Fri Nov 10 14:27:05 2023 +0100 Refactor deploy specs commit 85dd690 Author: scripthunter7 <[email protected]> Date: Fri Nov 10 13:58:22 2023 +0100 Remove calling clean from specs
AdguardTeam · Nov 10, 2023 · 350fe0f · 350fe0f
1 parent 09ad8d2
commit 350fe0f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
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--0
+  dockerNode: adguard/node-ssh:18.13--1
 
 stages:
   - Build:
@@ -50,7 +50,6 @@ Build:
             yarn prod
 
             # Cleanup
-            yarn clean
             rm -rf node_modules
             rm -rf client/node_modules
             rm -rf server/node_modules

diff --git a/bamboo-specs/deploy.yaml b/bamboo-specs/deploy.yaml
@@ -3,18 +3,20 @@ version: 2
 deployment:
   name: VSCode Adblock Syntax - Deploy
   source-plan: AJL-VSCODEADBLOCKSYNTAXBUILD
-release-naming: ${bamboo.userscriptMeta.version}
+release-naming: ${bamboo.inject.version}
 environments:
   - marketplace.visualstudio.com
   - open-vsx.org
+
 marketplace.visualstudio.com:
+  docker:
+    image: adguard/node-ssh:18.13--1
+    volumes:
+      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
   triggers: []
   tasks:
-    - clean
     - checkout:
-        repository: bamboo-deploy-publisher
-        path: bamboo-deploy-publisher
-        force-clean-build: 'false'
+        force-clean-build: 'true'
     - artifact-download:
         artifacts:
           - name: vscode-adblock.vsix
@@ -40,10 +42,7 @@ marketplace.visualstudio.com:
             yarn @vscode/vsce publish -p ${bamboo.vsceToken} -i vscode-adblock.vsix
 
             # Cleanup
-            yarn clean
             rm -rf node_modules
-  final-tasks: []
-  variables: {}
   requirements:
     - adg-docker: 'true'
   notifications:
@@ -52,15 +51,16 @@ marketplace.visualstudio.com:
       recipients:
         - webhook:
             name: Deploy webhook
-            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa
+            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
 
 open-vsx.org:
+  docker:
+    image: adguard/node-ssh:18.13--1
+    volumes:
+      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
   triggers: []
   tasks:
-    - clean
     - checkout:
-        repository: bamboo-deploy-publisher
-        path: bamboo-deploy-publisher
         force-clean-build: 'true'
     - artifact-download:
         artifacts:
@@ -87,10 +87,7 @@ open-vsx.org:
             yarn ovsx publish vscode-adblock.vsix -p ${bamboo.openVsxToken}
 
             # Cleanup
-            yarn clean
             rm -rf node_modules
-  final-tasks: []
-  variables: {}
   requirements:
     - adg-docker: 'true'
   notifications:
@@ -99,4 +96,4 @@ open-vsx.org:
       recipients:
         - webhook:
             name: Deploy webhook
-            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa
+            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
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--0
+  dockerNode: adguard/node-ssh:18.13--1
 
 stages:
   - Increment:

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--0
+  dockerNode: adguard/node-ssh:18.13--1
 
 stages:
   - Build: