Skip to content

Commit ce689d0

Browse files
committed
ci: rollback as vscode marketplace dont support prerelease semver
1 parent 1b61cdc commit ce689d0

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ on:
66
pull_request:
77
branches: [ "main" ]
88
workflow_call:
9-
inputs:
10-
prerelease:
11-
required: false
12-
type: boolean
13-
default: false
149

1510
jobs:
1611
build:
@@ -78,11 +73,7 @@ jobs:
7873
- name: Test extension
7974
run: xvfb-run --auto-servernum npm test
8075
- name: Package extension
81-
if: ${{ !inputs.prerelease }}
82-
run: vsce package
83-
- name: Package pre-release extension
84-
if: ${{ inputs.prerelease }}
85-
run: vsce package --pre-release
76+
run: vsce package # Should add --pre-release for publishing pre-release
8677
- name: Get version
8778
run: echo "PACKAGE_VERSION=$(npm pkg get version | sed 's/"//g')" >> $GITHUB_ENV
8879
- name: Check version

.github/workflows/deploy.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
build:
1111
uses: ./.github/workflows/build.yml
1212
secrets: inherit # for GH_PAT
13-
with:
14-
prerelease: ${{ !(github.event_name == 'release' && github.event.action == 'released') }}
1513

1614
deploy:
1715
permissions: write-all
@@ -28,20 +26,20 @@ jobs:
2826
name: extension
2927
- name: Publish to Open VSX Registry
3028
uses: HaaLeo/publish-vscode-extension@v1
31-
# Dont publish pre-release
29+
# Dont publish pre-release, vscode marketplace dont support semver != major.minor.patch
30+
if: github.event_name == 'release' && github.event.action == 'released'
3231
id: publishToOpenVSX
3332
with:
3433
pat: ${{ secrets.OPEN_VSX_PAT }}
3534
extensionFile: shader-validator.vsix
36-
preRelease: ${{ !(github.event_name == 'release' && github.event.action == 'released') }}
3735
- name: Publish to Visual Studio Marketplace
3836
uses: HaaLeo/publish-vscode-extension@v1
3937
# Dont publish pre-release
38+
if: github.event_name == 'release' && github.event.action == 'released'
4039
with:
4140
pat: ${{ secrets.MARKETPLACE_PAT }}
4241
registryUrl: https://marketplace.visualstudio.com
4342
extensionFile: shader-validator.vsix
44-
preRelease: ${{ !(github.event_name == 'release' && github.event.action == 'released') }}
4543
- name: Upload assets to release
4644
run: gh release upload ${{ github.ref_name }} "shader-validator.vsix"
4745
env:

0 commit comments

Comments
 (0)