Pull request 70: AG-49278 Remove GitHub Actions release workflow and migrate to Bamboo deployment

totadavid95 · maximtop · commit 7b30ebe8db11 · 2025-12-11T15:10:19.000+03:00
Squashed commit of the following: commit 7a315df Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 17:39:12 2025 +0100 Update cleanup script to preserve additional build artifacts - Add syntaxes/out/adblock.plist and EXTRACTED_CHANGES.md to preserved artifacts in cleanup.sh calls - Apply changes to both build.yaml and build-prerelease.yaml specifications commit 85d4d01 Merge: d473d2b fc8d0eb Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 17:37:02 2025 +0100 Merge branch 'master' into fix/AG-49278 commit d473d2b Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 08:40:10 2025 +0100 Add GitHub environment permissions for extensions-developers group - Add GitHub deployment environment to permissions.yaml and permissions-prerelease.yaml - Grant view and deploy permissions to extensions-developers group for GitHub environment commit fe53bf5 Author: scripthunter7 <d.tota@adguard.com> Date: Tue Dec 9 22:19:56 2025 +0100 Remove GitHub Actions release workflow and migrate to Bamboo deployment - Remove .github/workflows/release.yml GitHub Actions workflow - Add changelog extraction step to build.yaml and build-prerelease.yaml using changelog-tools - Add EXTRACTED_CHANGES.md and adblock.plist as shared artifacts in build specs - Add GitHub deployment environment to deploy.yaml and deploy-prerelease.yaml - Configure GitHub deployment tasks to publish releases using bamboo-deploy-publisher - Add @adguard/changelog-tools dependency
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/bamboo-specs/build-prerelease.yaml b/bamboo-specs/build-prerelease.yaml
@@ -64,25 +64,41 @@ Build:
         file: out/build.txt
         scope: RESULT
         namespace: inject
+    - script:
+        interpreter: SHELL
+        scripts:
+          - |
+            set -e
+
+            # Extract related changes from changelog
+            pnpm exec changelog-tools extract --extract-version ${bamboo.inject.version} > ./EXTRACTED_CHANGES.md
     - any-task:
         plugin-key: com.atlassian.bamboo.plugins.vcs:task.vcs.tagging
         configuration:
           selectedRepository: defaultRepository
           tagName: v${bamboo.inject.version}
-          # annotated tag
-          description: prerelease
   final-tasks:
     - script:
         interpreter: SHELL
         scripts:
-          - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix"
+          - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix syntaxes/out/adblock.plist EXTRACTED_CHANGES.md"
   # Store the .vsix file as a build artifact
   artifacts:
     - name: vscode-adblock.vsix
       location: out
       pattern: vscode-adblock.vsix
       shared: true
       required: true
+    - name: EXTRACTED_CHANGES.md
+      location: .
+      pattern: EXTRACTED_CHANGES.md
+      shared: true
+      required: true
+    - name: adblock.plist
+      location: syntaxes/out
+      pattern: adblock.plist
+      shared: true
+      required: true
   requirements:
     - adg-docker: true
 
diff --git a/bamboo-specs/build.yaml b/bamboo-specs/build.yaml
@@ -64,6 +64,14 @@ Build:
         file: out/build.txt
         scope: RESULT
         namespace: inject
+    - script:
+        interpreter: SHELL
+        scripts:
+          - |
+            set -e
+
+            # Extract related changes from changelog
+            pnpm exec changelog-tools extract --extract-version ${bamboo.inject.version} > ./EXTRACTED_CHANGES.md
     - any-task:
         plugin-key: com.atlassian.bamboo.plugins.vcs:task.vcs.tagging
         configuration:
@@ -73,14 +81,24 @@ Build:
     - script:
         interpreter: SHELL
         scripts:
-          - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix"
+          - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix syntaxes/out/adblock.plist EXTRACTED_CHANGES.md"
   # Store the .vsix file as a build artifact
   artifacts:
     - name: vscode-adblock.vsix
       location: out
       pattern: vscode-adblock.vsix
       shared: true
       required: true
+    - name: EXTRACTED_CHANGES.md
+      location: .
+      pattern: EXTRACTED_CHANGES.md
+      shared: true
+      required: true
+    - name: adblock.plist
+      location: syntaxes/out
+      pattern: adblock.plist
+      shared: true
+      required: true
   requirements:
     - adg-docker: true
 
diff --git a/bamboo-specs/deploy-prerelease.yaml b/bamboo-specs/deploy-prerelease.yaml
@@ -7,6 +7,7 @@ release-naming: ${bamboo.inject.version}
 environments:
   - marketplace.visualstudio.com
   - open-vsx.org
+  - GitHub
 
 marketplace.visualstudio.com:
   docker:
@@ -102,3 +103,42 @@ open-vsx.org:
         - webhook:
             name: Deploy webhook
             url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
+
+GitHub:
+  triggers: []
+  tasks:
+    - clean
+    - checkout:
+        repository: bamboo-deploy-publisher
+        path: bamboo-deploy-publisher
+        force-clean-build: true
+    - artifact-download:
+        artifacts:
+          - name: vscode-adblock.vsix
+          - name: EXTRACTED_CHANGES.md
+          - name: adblock.plist
+    - script:
+        interpreter: SHELL
+        scripts:
+          - |-
+            set -x
+            set -e
+
+            # Fix mixed logs
+            exec 2>&1
+
+            ls -laht
+
+            # publish to Github Releases
+            GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}" \
+            ./bamboo-deploy-publisher/deploy.sh vscode-adblock-syntax-github-prerelease
+  final-tasks: []
+  requirements:
+    - adg-docker: 'true'
+  notifications:
+    - events:
+        - deployment-started-and-finished
+      recipients:
+        - webhook:
+            name: Deploy webhook
+            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
diff --git a/bamboo-specs/deploy.yaml b/bamboo-specs/deploy.yaml
@@ -7,6 +7,7 @@ release-naming: ${bamboo.inject.version}
 environments:
   - marketplace.visualstudio.com
   - open-vsx.org
+  - GitHub
 
 marketplace.visualstudio.com:
   docker:
@@ -102,3 +103,42 @@ open-vsx.org:
         - webhook:
             name: Deploy webhook
             url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
+
+GitHub:
+  triggers: []
+  tasks:
+    - clean
+    - checkout:
+        repository: bamboo-deploy-publisher
+        path: bamboo-deploy-publisher
+        force-clean-build: true
+    - artifact-download:
+        artifacts:
+          - name: vscode-adblock.vsix
+          - name: EXTRACTED_CHANGES.md
+          - name: adblock.plist
+    - script:
+        interpreter: SHELL
+        scripts:
+          - |-
+            set -x
+            set -e
+
+            # Fix mixed logs
+            exec 2>&1
+
+            ls -laht
+
+            # publish to Github Releases
+            GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}" \
+            ./bamboo-deploy-publisher/deploy.sh vscode-adblock-syntax-github-release
+  final-tasks: []
+  requirements:
+    - adg-docker: 'true'
+  notifications:
+    - events:
+        - deployment-started-and-finished
+      recipients:
+        - webhook:
+            name: Deploy webhook
+            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
diff --git a/bamboo-specs/permissions-prerelease.yaml b/bamboo-specs/permissions-prerelease.yaml
@@ -20,3 +20,9 @@ environment-permissions:
         permissions:
           - view
           - deploy
+  - GitHub:
+      - groups:
+          - extensions-developers
+        permissions:
+          - view
+          - deploy
diff --git a/bamboo-specs/permissions.yaml b/bamboo-specs/permissions.yaml
@@ -20,3 +20,9 @@ environment-permissions:
         permissions:
           - view
           - deploy
+  - GitHub:
+      - groups:
+          - extensions-developers
+        permissions:
+          - view
+          - deploy
diff --git a/package.json b/package.json
@@ -100,6 +100,7 @@
         "watch:server": "pnpm esbuild:server --sourcemap --watch"
     },
     "devDependencies": {
+        "@adguard/changelog-tools": "^0.0.1",
         "@swc/core": "^1.3.76",
         "@swc/jest": "^0.2.28",
         "@types/fs-extra": "^11.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
