From 0e8281a5e4f5bd52ab1899f77dc46f71dca954a9 Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:41:07 -0600 Subject: [PATCH 1/2] update version and changelog --- CHANGELOG.md | 6 +++++- package.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 562d61f..44d90a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -162,4 +162,8 @@ All notable changes to the "vscode-nushell-lang" extension will be documented in - Syntax highlight: add "export" to "module" (@glcraft) [#166](https://github.com/nushell/vscode-nushell-lang/pull/166) - Improve type parsing in function def (@glcraft) [#167](https://github.com/nushell/vscode-nushell-lang/pull/167) - Textmate improvements (@glcraft) [#168](https://github.com/nushell/vscode-nushell-lang/pull/168) - - Textmate: improvement on record entries and closure (@glcraft) [#169](https://github.com/nushell/vscode-nushell-lang/pull/169) \ No newline at end of file + - Textmate: improvement on record entries and closure (@glcraft) [#169](https://github.com/nushell/vscode-nushell-lang/pull/169) +- 1.9.0 + - Add spread to syntax highlighting [#174](https://github.com/nushell/vscode-nushell-lang/pull/174) + - fix markdown formatting for hover lsp [#175](https://github.com/nushell/vscode-nushell-lang/pull/175) + - update grammar for nushell 0.91.0 [#177](https://github.com/nushell/vscode-nushell-lang/pull/177) \ No newline at end of file diff --git a/package.json b/package.json index 7012c5d..23d608a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "vscode-nushell-lang", "description": "nushell language for vscode", "author": "The Nushell Project Developers", - "version": "1.8.0", + "version": "1.9.0", "preview": false, "license": "MIT", "publisher": "TheNuProjectContributors", From f69281118421537acadb7102617c35026633abfa Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:45:29 -0600 Subject: [PATCH 2/2] update release ci --- .github/workflows/release.yml | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2bcd9c1..0529de5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ #name: Release -# Controls when the action will run. +# Controls when the action will run. #on: # Triggers the workflow on push or pull request events but only for the main branch #push: @@ -34,7 +34,7 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - run: npm install - + #- name: Current NPM Package Version #- uses: justincy/npm-version-action@2.1.0 # id: info @@ -47,22 +47,7 @@ jobs: - uses: lannonbr/vsce-action@master with: args: "package" - - # Note: This works but you can't unpublish something so if the next thing fails, you're just stuck. - #- name: Publish to Open VSX Registry - # uses: HaaLeo/publish-vscode-extension@v1 - # id: publishOpenVSX - # with: - # pat: ${{ secrets.OPEN_VSX_TOKEN }} - # Note: Probably should publish VS Marketplace first since, OpenVSX is proved working. - #- name: Publish to Visual Studio Marketplace - # uses: HaaLeo/publish-vscode-extension@v1 - # with: - # pat: ${{ secrets.VS_MARKETPLACE_TOKEN }} - # registryUrl: https://marketplace.visualstudio.com - # extensionFile: ${{ steps.publishOpenVSX.outputs.vsixPath }} - - name: Create Release id: create_release uses: actions/create-release@v1 @@ -73,15 +58,30 @@ jobs: release_name: ${{ steps.ver.outputs.packageVersion }} Release draft: true prerelease: true - + - name: Upload Release Asset - id: upload-release-asset + id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps #asset_path: ${{ steps.publishOpenVSX.outputs.vsixPath }} # Need to get this version number dynamically asset_path: ./vscode-nushell-lang-${{ steps.ver.outputs.packageVersion }}.vsix # Need to get this version number dynamically asset_name: vscode-nushell-lang-${{ steps.ver.outputs.packageVersion }}.vsix asset_content_type: application/vsix + + # Note: Probably should publish VS Marketplace first since, OpenVSX is proved working. + #- name: Publish to Visual Studio Marketplace + # uses: HaaLeo/publish-vscode-extension@v1 + # with: + # pat: ${{ secrets.VS_MARKETPLACE_TOKEN }} + # registryUrl: https://marketplace.visualstudio.com + # extensionFile: ${{ steps.publishOpenVSX.outputs.vsixPath }} + + # Note: This works but you can't unpublish something so if the next thing fails, you're just stuck. + - name: Publish to Open VSX Registry + uses: HaaLeo/publish-vscode-extension@v1 + id: publishOpenVSX + with: + pat: ${{ secrets.OPEN_VSX_TOKEN }}