diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index ceb20b5..9ebaa88 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -126,13 +126,13 @@ jobs: secret/data/ci-secrets/ext-vscode-adblock-syntax vsce_pat | VSCE_PAT ; secret/data/ci-secrets/ext-vscode-adblock-syntax ovsx_pat | OVSX_PAT ; - - name: Install dependencies (publish CLIs) - run: pnpm install --frozen-lockfile --ignore-scripts - + # Host has npm but not pnpm. Publish only needs vsce/ovsx against the + # prebuilt .vsix — no monorepo install. Versions match pnpm-workspace catalog. - name: Publish to Visual Studio Marketplace env: VSCE_PAT: ${{ steps.vault.outputs.VSCE_PAT }} run: | + set -euo pipefail if [ -z "${VSCE_PAT}" ]; then echo "VSCE_PAT was not returned from Vault" >&2 exit 1 @@ -142,13 +142,17 @@ jobs: PRE_ARGS+=(--pre-release) fi # https://code.visualstudio.com/api/working-with-extensions/publishing-extension - pnpm exec vsce publish --pat "${VSCE_PAT}" --no-dependencies "${PRE_ARGS[@]}" \ + npx --yes @vscode/vsce@3.7.1 publish \ + --pat "${VSCE_PAT}" \ + --no-dependencies \ + "${PRE_ARGS[@]}" \ -i artifacts/vscode-adblock.vsix - name: Publish to Open VSX env: OVSX_PAT: ${{ steps.vault.outputs.OVSX_PAT }} run: | + set -euo pipefail if [ -z "${OVSX_PAT}" ]; then echo "OVSX_PAT was not returned from Vault" >&2 exit 1 @@ -158,7 +162,8 @@ jobs: PRE_ARGS+=(--pre-release) fi # https://github.com/eclipse/openvsx/wiki/Publishing-Extensions - pnpm exec ovsx publish artifacts/vscode-adblock.vsix \ + npx --yes ovsx@0.10.7 publish \ + artifacts/vscode-adblock.vsix \ -p "${OVSX_PAT}" \ "${PRE_ARGS[@]}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 83cdeb9..0f34b1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,20 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic ## [Unreleased] +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [2.1.6] - 2026-08-24 + ### Changed - Improved syntax highlighting for network rules and modifiers [#93], [#120], [#131], [#137]. @@ -17,7 +31,6 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic - Highlighting for cosmetic rules modifiers [#134], [#151]. - Highlighting nested selector in CSS pseudo-class [#156]. - [#120]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/120 [#131]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/131 [#134]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/134 @@ -540,7 +553,8 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic [AGLint]: https://github.com/AdguardTeam/AGLint/blob/master/CHANGELOG.md -[Unreleased]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/v2.1.4...HEAD +[Unreleased]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/v2.1.6...HEAD +[2.1.6]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/v2.1.4...v2.1.6 [2.1.4]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/v2.1.3...v2.1.4 [2.1.3]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/v2.0.4...v2.1.3 [2.0.4]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/v2.0.3...v2.0.4