From d3e04cd98e11a096da010cb41bfb9d0157ea1b26 Mon Sep 17 00:00:00 2001 From: Jeroen Van Antwerpen Date: Tue, 18 Feb 2025 14:31:59 +0000 Subject: [PATCH] #765 Update packaging such that a pre-release version is created --- .github/workflows/auto-release.yml | 21 +++++++++++++++++++-- CHANGELOG.md | 12 ++++++++++++ package-lock.json | 6 +++--- package.json | 4 +++- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 9d8e07e2..a8211f51 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -17,13 +17,27 @@ jobs: id: check with: diff-search: true # seach the diff content with version + - if: steps.check.outputs.changed == 'true' + id: is_preview + run: | + IFS=', ' read -r -a array <<< "$string" + if [ $((array[1]%2)) -eq 0 ]; + then + echo ::set-output name=is_preview"false" + else + echo ::set-output name=is_preview"true" + fi + shell: bash - if: steps.check.outputs.changed == 'true' run: npm ci - if: steps.check.outputs.changed == 'true' run: npm test - name: package - if: steps.check.outputs.changed == 'true' + if: steps.check.outputs.changed == 'true' && steps.is_preview.outputs.is_preview == 'false' run: npm run package + - name: package + if: steps.check.outputs.changed == 'true' && steps.is_preview.outputs.is_preview == 'true' + run: npm run package-pre-release - name: publish to Github uses: ncipollo/release-action@v1 if: steps.check.outputs.changed == 'true' @@ -33,10 +47,13 @@ jobs: commit: ${{ steps.check.outputs.commit }} token: ${{ secrets.GITHUB_TOKEN }} - name: publish to VSCode Marketplace - if: steps.check.outputs.changed == 'true' + if: steps.check.outputs.changed == 'true' && steps.is_preview.outputs.is_preview == 'false' # The token will expire. Regenerate it at: # https://llvm-vs-code-extensions.visualstudio.com/_usersSettings/tokens. run: npm run publish -- -p "${{ secrets.VSCODE_MARKETPLACE_TOKEN }}" + - name: publish to VSCode Marketplace + if: steps.check.outputs.changed == 'true' && steps.is_preview.outputs.is_preview == 'true' + run: npm run publish-pre-release -- -p "${{ secrets.VSCODE_MARKETPLACE_TOKEN }}" - name: publish to OpenVSX if: steps.check.outputs.changed == 'true' # The token will expire. Regenerate it at: diff --git a/CHANGELOG.md b/CHANGELOG.md index a95f7349..e8b1c414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## Version 0.1.34: Februari 19, 2025 + +* Create pre-release flows [#748](https://github.com/clangd/vscode-clangd/issues/748) [#753](https://github.com/clangd/vscode-clangd/issues/753) [#765](https://github.com/clangd/vscode-clangd/issues/765) +* Clean up disposables in early-return path of ClangdContext.create() [#743](https://github.com/clangd/vscode-clangd/issues/743) +* Publish API package to the default registry [#746](https://github.com/clangd/vscode-clangd/issues/746) +* Documentation + * Mention the clangd config file in the README [#752](https://github.com/clangd/vscode-clangd/issues/752) + * Mention the editor.defaultFormatter setting [#768](https://github.com/clangd/vscode-clangd/issues/768) +* Add an option to allow "clangd.path" to point to a shell script [#683](https://github.com/clangd/vscode-clangd/issues/683) +* Automatically restart clangd language server after it is installed [#749](https://github.com/clangd/vscode-clangd/issues/749) +* Handle workspace symbols searches with a '::' prefix [#769](https://github.com/clangd/vscode-clangd/issues/769) + ## Version 0.1.33: November 21, 2024 * Reverted [#730](https://github.com/clangd/vscode-clangd/pull/730) for causing [#734](https://github.com/clangd/vscode-clangd/issues/734) diff --git a/package-lock.json b/package-lock.json index b35e1cc0..7559ff5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-clangd", - "version": "0.1.33", + "version": "0.1.34", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-clangd", - "version": "0.1.33", + "version": "0.1.34", "license": "MIT", "dependencies": { "@clangd/install": "0.1.17", @@ -5848,4 +5848,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 8a4901a5..7f57bfc3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-clangd", "displayName": "clangd", "description": "C/C++ completion, navigation, and insights", - "version": "0.1.33", + "version": "0.1.34", "publisher": "llvm-vs-code-extensions", "license": "MIT", "homepage": "https://clangd.llvm.org/", @@ -43,6 +43,8 @@ "test": "npm run test-compile && node ./out/test/index.js", "package": "vsce package --baseImagesUrl https://raw.githubusercontent.com/clangd/vscode-clangd/master/", "publish": "vsce publish --baseImagesUrl https://raw.githubusercontent.com/clangd/vscode-clangd/master/", + "package-pre-release": "vsce package --pre-release --baseImagesUrl https://raw.githubusercontent.com/clangd/vscode-clangd/master/", + "publish-pre-release": "vsce publish --pre-release --baseImagesUrl https://raw.githubusercontent.com/clangd/vscode-clangd/master/", "publish-openvsx": "ovsx publish --baseImagesUrl https://raw.githubusercontent.com/clangd/vscode-clangd/master/", "git-clang-format": "git-clang-format --extensions=ts" },