[pull] master from AdguardTeam:master#44
Merged
Conversation
Squashed commit of the following: commit 599a7dc Merge: 08e052e 622920e Author: scripthunter7 <d.tota@adguard.com> Date: Fri Dec 12 12:01:03 2025 +0100 Merge branch 'master' into fix/AG-45259-1 commit 08e052e Author: scripthunter7 <d.tota@adguard.com> Date: Fri Dec 12 10:00:27 2025 +0100 Add version comparison links to CHANGELOG.md and set 2.1.0 release date - Set release date for version 2.1.0 to 2025-12-15 - Add GitHub comparison link for version 2.1.0 (2.0.4...2.1.0) - Add GitHub comparison link for version 2.0.4 (2.0.3...2.0.4) commit 6fd7071 Author: scripthunter7 <d.tota@adguard.com> Date: Fri Dec 12 09:57:33 2025 +0100 Quote adg-docker requirement values in Bamboo specifications - Change adg-docker requirement from unquoted true to quoted 'true' - Apply changes to build.yaml, build-prerelease.yaml, and increment.yaml specifications commit 0ee3aae Author: Slava Leleka <v.leleka@adguard.com> Date: Fri Dec 12 11:55:53 2025 +0300 Applied suggestion commit 8824e48 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 16:10:03 2025 +0100 Remove redundant constants test file from client package commit 4b16db9 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 14:08:00 2025 +0100 Update version to 2.1.0 and document odd/even pre-release versioning scheme - Bump version from 2.0.4 to 2.1.0 in package.json - Add 2.1.0 changelog entry with internal improvements note - Add versioning policy section to CONTRIBUTING.md documenting odd/even scheme for pre-releases - Explain VS Code Marketplace limitation that prevents using pre-release tags like -alpha or -beta - Document version progression example: 2.0.0 → 2.1.0 (pre-release) → 2.1.1 → 2.2.0 (stable) - Add references to commit 26ae9b3 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:51:03 2025 +0100 Add --no-color flag to all package test commands in Bamboo test workflow - Add --no-color flag to test commands for Shared, Syntaxes, Client, and Server packages - Improve test output readability in Bamboo CI environment by disabling color codes commit 8a4f959 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:44:55 2025 +0100 Normalize job name to use 'and' instead of ampersand in Bamboo test workflow - Change "Build & Package" to "Build and Package" in stage definition and job name - Apply consistent naming convention across Bamboo specifications commit 4a2e3f5 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:44:00 2025 +0100 Refactor Bamboo test workflow to run package-specific tests in parallel stages - Split monolithic Build job into 5 separate jobs: Test Shared, Test Syntaxes, Test Client, Test Server, and Build & Package - Organize jobs into 3 stages based on package dependencies: Stage 1 (Shared, Syntaxes), Stage 2 (Client, Server), Stage 3 (Build & Package) - Add package-specific test commands for each workspace package (type checking, linting, unit tests) - Extract common configuration using YAML anchors for docker commit 6b0da21 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:29:09 2025 +0100 Update cleanup script calls to use comma-separated artifact list instead of space-separated arguments - Change cleanup.sh invocation from space-separated to comma-separated artifact list - Apply changes to build.yaml, build-prerelease.yaml, and test.yaml specifications commit 7409ba6 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:25:19 2025 +0100 Add adblock.plist artifact to test workflows and update artifact configuration - Add syntaxes/out/adblock.plist to GitHub Actions artifact upload - Rename GitHub Actions artifact from vscode-adblock-vsix to vscode-adblock-build - Update Bamboo cleanup script to preserve adblock.plist artifact - Split Bamboo artifacts into separate vscode-adblock.vsix and adblock.plist entries - Set both Bamboo artifacts as required and shared - Add location property to Bamboo artifact definitions commit 0fdc1d3 Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:21:41 2025 +0100 Add extension build and packaging steps to test workflows - Add build and package steps to GitHub Actions check.yml workflow - Add VSIX artifact upload to GitHub Actions with 30-day retention - Add build and package steps to Bamboo test.yaml specification - Add VSIX file tree listing to Bamboo test workflow - Configure cleanup script to preserve out/vscode-adblock.vsix artifact - Add vscode-adblock.vsix as shared artifact in Bamboo test spec commit e45e6ef Merge: f184f78 7b30ebe Author: scripthunter7 <d.tota@adguard.com> Date: Thu Dec 11 13:15:09 2025 +0100 Merge branch 'master' into fix/AG-45259-1 commit f184f78 Merge: 387f3ad fc8d0eb Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 17:40:18 2025 +0100 Merge branch 'master' into fix/AG-45259-1 commit 387f3ad Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 12:39:12 2025 +0100 Normalize line endings to LF across all test files and configuration files - Convert CRLF to LF line endings in .eslintignore - Normalize line endings in all AGLint test files (.aglintignore, .aglintrc.yml, .txt files) - Update line endings in multi-root workspace configuration files - Add missing final newlines to custom-config files commit 3fd0ba2 Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 12:37:55 2025 +0100 Add EditorConfig file and normalize whitespace/formatting across all configuration files - Add .editorconfig with LF line endings, UTF-8 charset, and 2-space indentation for JSON files - Add editorconfig.editorconfig to recommended VSCode extensions - Normalize indentation in all tsconfig.json files (replace tabs with spaces) - Remove trailing commas from JSON arrays - Add missing final newlines to configuration files - Standardize array formatting to single-line where appropriate commit d5d9c8d Merge: da10f55 885667f Author: scripthunter7 <d.tota@adguard.com> Date: Wed Dec 10 12:28:53 2025 +0100 Merge branch 'master' into fix/AG-45259-1 commit da10f55 Author: scripthunter7 <d.tota@adguard.com> Date: Tue Dec 9 20:50:16 2025 +0100 Refactor release workflow to use changelog-tools and conditional VSIX packaging - Move VSIX packaging after changelog extraction and variable setup - Add conditional packaging based on IS_PRERELEASE flag (package:pre vs package) - Replace npx changelog-tools with pnpm exec changelog-tools extract command - Update version extraction to use --json flag with jq for proper parsing - Change changelog output from ./out/TEMP_CHANGES.md to ./EXTRACTED_CHANGES.md - Remove build.txt creation step (no longer needed) commit 6734747 Author: scripthunter7 <d.tota@adguard.com> Date: Tue Dec 9 20:10:14 2025 +0100 Add VSIX file tree listing to build and prerelease pipelines - Add `pnpm exec vsce ls --tree` command to both build.yaml and build-prerelease.yaml - Display packaged file tree after VSIX creation for build verification - Insert command between package step and build.txt creation commit d1801f4 Author: scripthunter7 <d.tota@adguard.com> Date: Tue Dec 9 20:04:06 2025 +0100 Update workspace dependencies: @types/semver, chokidar, husky, semver, tsx, valibot, vscode-textmate, and yaml - Update @types/semver from ^7.5.0 to ^7.7.1 - Update chokidar from ^4.0.3 to ^5.0.0 - Update husky from ^9.0.1 to ^9.1.7 - Update semver from ^7.5.4 to ^7.7.3 - Update tsx from ^4.7.0 to ^4.21.0 - Update valibot from ^1.1.0 to ^1.2.0 - Update vscode-textmate from ^9.2.0 to ^9.3.0 - Update yaml from ^2.8.1 to ^2.8.2 - Update transitive dependencies including ansi-escapes, brace-expansion, glob ... and 50 more commits
Squashed commit of the following: commit 9729ebc Author: scripthunter7 <d.tota@adguard.com> Date: Mon Dec 15 13:40:03 2025 +0100 Add shared library build step before type checking in prerelease workflow - Add explicit build step for @vscode-adblock-syntax/shared package before type checking - Ensure shared library is built before dependent packages (client and server) are compiled - Prevents type checking failures due to missing shared library build artifacts
…ent pipelines Squashed commit of the following: commit 03ada4a Author: scripthunter7 <d.tota@adguard.com> Date: Mon Dec 15 14:19:53 2025 +0100 Add build.txt artifact to build and deployment pipelines - Add build.txt as shared and required artifact in build.yaml and build-prerelease.yaml - Include build.txt in artifact downloads for deploy.yaml and deploy-prerelease.yaml - Set artifact location to out directory with pattern build.txt
Squashed commit of the following: commit c8048d3 Author: scripthunter7 <d.tota@adguard.com> Date: Mon Dec 15 16:58:45 2025 +0100 Update version to 2.1.1 in package.json and CHANGELOG.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )