From 2df57ad4b08bf218af28c94ced32237bdf412dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20T=C3=B3ta?= Date: Mon, 15 Dec 2025 19:35:25 +0300 Subject: [PATCH 1/2] Update version to 2.1.2 and preserve build.txt artifact in cleanup scripts Squashed commit of the following: commit f6d659d7aa6714bbe7fb1d946dd28507818e2617 Author: scripthunter7 Date: Mon Dec 15 17:32:45 2025 +0100 Update version to 2.1.2 and preserve build.txt artifact in cleanup scripts - Bump version from 2.1.1 to 2.1.2 in package.json - Update CHANGELOG.md version and comparison link to 2.1.2 - Add build.txt to preserved artifacts in cleanup.sh calls for both build.yaml and build-prerelease.yaml --- CHANGELOG.md | 4 ++-- bamboo-specs/build-prerelease.yaml | 2 +- bamboo-specs/build.yaml | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3dcda..9f85dab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/ [Semantic Versioning]: https://semver.org/spec/v2.0.0.html -## [2.1.1] (prerelease) - 2025-12-15 +## [2.1.2] (prerelease) - 2025-12-15 ### Changed @@ -17,7 +17,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic > **Note:** Starting from v2.1.0, we follow an odd/even versioning scheme for pre-releases. > Version 2.1.x will be the pre-release track, and 2.2.0 will be the next stable release. -[2.1.1]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/2.0.4...2.1.1 +[2.1.2]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/2.0.4...2.1.2 ## [2.0.4] (prerelease) - 2025-11-28 diff --git a/bamboo-specs/build-prerelease.yaml b/bamboo-specs/build-prerelease.yaml index ad7621a..27b71cc 100644 --- a/bamboo-specs/build-prerelease.yaml +++ b/bamboo-specs/build-prerelease.yaml @@ -90,7 +90,7 @@ Build: - script: interpreter: SHELL scripts: - - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md" + - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md,build.txt" # Store the .vsix file as a build artifact artifacts: - name: vscode-adblock.vsix diff --git a/bamboo-specs/build.yaml b/bamboo-specs/build.yaml index 2cb269e..19f7d33 100644 --- a/bamboo-specs/build.yaml +++ b/bamboo-specs/build.yaml @@ -90,7 +90,7 @@ Build: - script: interpreter: SHELL scripts: - - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md" + - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md,build.txt" # Store the .vsix file as a build artifact artifacts: - name: vscode-adblock.vsix diff --git a/package.json b/package.json index 7600662..d3f2111 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "adblock", "displayName": "Adblock/AdGuard/uBlock filters grammar", "description": "VS code extension that adds support for ad blocking rules syntax.", - "version": "2.1.1", + "version": "2.1.2", "publisher": "adguard", "icon": "icons/aglint_128x128.png", "main": "./client/out/extension", From d53701e62af9412f68ccaa7f08002e1c502b3bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20T=C3=B3ta?= Date: Mon, 15 Dec 2025 19:51:41 +0300 Subject: [PATCH 2/2] Update version to 2.1.3 and fix build.txt artifact path in cleanup scripts Squashed commit of the following: commit 283efc3a56ed2a3aa2c870f9ebe19df6b0d7f905 Author: scripthunter7 Date: Mon Dec 15 17:40:36 2025 +0100 Update version to 2.1.3 and fix build.txt artifact path in cleanup scripts - Bump version from 2.1.2 to 2.1.3 in package.json - Update CHANGELOG.md version and comparison link to 2.1.3 - Fix build.txt path from build.txt to out/build.txt in cleanup.sh calls for both build.yaml and build-prerelease.yaml --- CHANGELOG.md | 4 ++-- bamboo-specs/build-prerelease.yaml | 2 +- bamboo-specs/build.yaml | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f85dab..4ef2e16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/ [Semantic Versioning]: https://semver.org/spec/v2.0.0.html -## [2.1.2] (prerelease) - 2025-12-15 +## [2.1.3] (prerelease) - 2025-12-15 ### Changed @@ -17,7 +17,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic > **Note:** Starting from v2.1.0, we follow an odd/even versioning scheme for pre-releases. > Version 2.1.x will be the pre-release track, and 2.2.0 will be the next stable release. -[2.1.2]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/2.0.4...2.1.2 +[2.1.3]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/2.0.4...2.1.3 ## [2.0.4] (prerelease) - 2025-11-28 diff --git a/bamboo-specs/build-prerelease.yaml b/bamboo-specs/build-prerelease.yaml index 27b71cc..efa256f 100644 --- a/bamboo-specs/build-prerelease.yaml +++ b/bamboo-specs/build-prerelease.yaml @@ -90,7 +90,7 @@ Build: - script: interpreter: SHELL scripts: - - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md,build.txt" + - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md,out/build.txt" # Store the .vsix file as a build artifact artifacts: - name: vscode-adblock.vsix diff --git a/bamboo-specs/build.yaml b/bamboo-specs/build.yaml index 19f7d33..7c49af7 100644 --- a/bamboo-specs/build.yaml +++ b/bamboo-specs/build.yaml @@ -90,7 +90,7 @@ Build: - script: interpreter: SHELL scripts: - - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md,build.txt" + - "./bamboo-specs/scripts/cleanup.sh out/vscode-adblock.vsix,syntaxes/out/adblock.plist,EXTRACTED_CHANGES.md,out/build.txt" # Store the .vsix file as a build artifact artifacts: - name: vscode-adblock.vsix diff --git a/package.json b/package.json index d3f2111..5295bbe 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "adblock", "displayName": "Adblock/AdGuard/uBlock filters grammar", "description": "VS code extension that adds support for ad blocking rules syntax.", - "version": "2.1.2", + "version": "2.1.3", "publisher": "adguard", "icon": "icons/aglint_128x128.png", "main": "./client/out/extension",