[pull] master from AdguardTeam:master

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
 

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
 

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

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

bamboo-specs/permissions-prerelease.yaml

@@ -20,3 +20,9 @@ environment-permissions:
         permissions:
           - view
           - deploy
+  - GitHub:
+      - groups:
+          - extensions-developers
+        permissions:
+          - view
+          - deploy

bamboo-specs/permissions.yaml

@@ -20,3 +20,9 @@ environment-permissions:
         permissions:
           - view
           - deploy
+  - GitHub:
+      - groups:
+          - extensions-developers
+        permissions:
+          - view
+          - deploy

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",