Skip to content

Commit

Permalink
ci: remove workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
serkonda7 committed Mar 1, 2024
1 parent 2f250ff commit 3c62e56
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ on:
branches: [main]
tags: ['*']


env:
VSIX_FILE: "vscode-vba-${{ github.ref_name }}.vsix"


jobs:
test:
strategy:
Expand Down Expand Up @@ -51,8 +56,8 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v4
with:
name: vba.vsix
path: vba.vsix
name: ${{ env.VSIX_FILE }}
path: ${{ env.VSIX_FILE }}
if-no-files-found: error


Expand All @@ -66,13 +71,13 @@ jobs:
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: vba.vsix
name: ${{ env.VSIX_FILE }}

- name: Create Release
uses: softprops/action-gh-release@v1
with:
fail_on_unmatched_files: true
files: vba.vsix
files: ${{ env.VSIX_FILE }}

- id: publish_to_marketplace
name: Publish to VS Code Marketplace
Expand All @@ -81,11 +86,11 @@ jobs:
with:
pat: ${{ secrets.VSCE_PAT }}
registryUrl: https://marketplace.visualstudio.com
extensionFile: vba.vsix
extensionFile: ${{ env.VSIX_FILE }}

- name: Publish to Open VSX Registry
if: always()
uses: HaaLeo/publish-vscode-extension@v1
with:
pat: ${{ secrets.OPEN_VSX_PAT }}
extensionFile: vba.vsix
extensionFile: ${{ env.VSIX_FILE }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"test-vba": "vscode-tmgrammar-test -g ./out/vba.json \"syntaxes/tests/vba/*.bas\"",
"test-wwb": "vscode-tmgrammar-test -g ./out/wwb.json \"syntaxes/tests/other/*.wwd\"",
"install-dev-ext": "vsce package -o ./out/vscode-vba-dev.vsix && code --install-extension ./out/vscode-vba-dev.vsix --force",
"package": "vsce package -o vba.vsix",
"package": "vsce package",
"convert-yaml": "yaml2json language-configuration.yml \"syntaxes/*.yaml-tmlanguage\" \"snippets/*.yml\"",
"vscode:prepublish": "pnpm run compile && pnpm run convert-yaml"
},
Expand Down

0 comments on commit 3c62e56

Please sign in to comment.