Skip to content

Commit 3c62e56

Browse files
committed
ci: remove workaround
1 parent 2f250ff commit 3c62e56

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ on:
66
branches: [main]
77
tags: ['*']
88

9+
10+
env:
11+
VSIX_FILE: "vscode-vba-${{ github.ref_name }}.vsix"
12+
13+
914
jobs:
1015
test:
1116
strategy:
@@ -51,8 +56,8 @@ jobs:
5156
if: startsWith(github.ref, 'refs/tags/')
5257
uses: actions/upload-artifact@v4
5358
with:
54-
name: vba.vsix
55-
path: vba.vsix
59+
name: ${{ env.VSIX_FILE }}
60+
path: ${{ env.VSIX_FILE }}
5661
if-no-files-found: error
5762

5863

@@ -66,13 +71,13 @@ jobs:
6671
- name: Download artifact
6772
uses: actions/download-artifact@v4
6873
with:
69-
name: vba.vsix
74+
name: ${{ env.VSIX_FILE }}
7075

7176
- name: Create Release
7277
uses: softprops/action-gh-release@v1
7378
with:
7479
fail_on_unmatched_files: true
75-
files: vba.vsix
80+
files: ${{ env.VSIX_FILE }}
7681

7782
- id: publish_to_marketplace
7883
name: Publish to VS Code Marketplace
@@ -81,11 +86,11 @@ jobs:
8186
with:
8287
pat: ${{ secrets.VSCE_PAT }}
8388
registryUrl: https://marketplace.visualstudio.com
84-
extensionFile: vba.vsix
89+
extensionFile: ${{ env.VSIX_FILE }}
8590

8691
- name: Publish to Open VSX Registry
8792
if: always()
8893
uses: HaaLeo/publish-vscode-extension@v1
8994
with:
9095
pat: ${{ secrets.OPEN_VSX_PAT }}
91-
extensionFile: vba.vsix
96+
extensionFile: ${{ env.VSIX_FILE }}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"test-vba": "vscode-tmgrammar-test -g ./out/vba.json \"syntaxes/tests/vba/*.bas\"",
121121
"test-wwb": "vscode-tmgrammar-test -g ./out/wwb.json \"syntaxes/tests/other/*.wwd\"",
122122
"install-dev-ext": "vsce package -o ./out/vscode-vba-dev.vsix && code --install-extension ./out/vscode-vba-dev.vsix --force",
123-
"package": "vsce package -o vba.vsix",
123+
"package": "vsce package",
124124
"convert-yaml": "yaml2json language-configuration.yml \"syntaxes/*.yaml-tmlanguage\" \"snippets/*.yml\"",
125125
"vscode:prepublish": "pnpm run compile && pnpm run convert-yaml"
126126
},

0 commit comments

Comments
 (0)