Skip to content

Commit d514284

Browse files
committed
Fix EXT_VERSION and ensure it is only defined once.
- EXT_VERSION should be defined in both the pre-release and release cases following the preparation of the pre-release Signed-off-by: Roland Grunberg <[email protected]>
1 parent 37aaa27 commit d514284

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ jobs:
8787
- name: Install dependencies
8888
run: npm install -g typescript "vsce" "ovsx"
8989
- run: echo "XML_SERVER_VERSION=$(cat package.json | jq -r .xmlServer.version)" >> $GITHUB_ENV
90-
- run: echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
9190
- name: Download LemMinX Server Uber Jar
9291
env:
9392
downloadLocation: https://github.com/redhat-developer/vscode-xml
@@ -99,18 +98,19 @@ jobs:
9998
run: |
10099
npm install
101100
npm run vscode:prepublish
101+
- name: Prepare Pre-Release
102+
if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true' }}
103+
run: |
104+
npx gulp prepare_pre_release
105+
echo "publishPreReleaseFlag=--pre-release" >> $GITHUB_ENV
102106
- run: |
103107
mkdir server/
104108
if [ -e org.eclipse.lemminx*-uber.jar ]; then
105109
mv org.eclipse.lemminx*-uber.jar server/
106110
else
107111
cp ../staging/org.eclipse.lemminx*-uber.jar server/
108112
fi
109-
- name: Prepare Pre-Release
110-
if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true' }}
111-
run: |
112-
npx gulp prepare_pre_release
113-
echo "publishPreReleaseFlag=--pre-release" >> $GITHUB_ENV
113+
echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
114114
- name: Download LemMinX Binary Artifacts
115115
uses: actions/download-artifact@v3
116116
- name: Prepare Binary Artifacts For Packaging
@@ -178,7 +178,6 @@ jobs:
178178
- name: Install dependencies
179179
run: npm install -g typescript "vsce" "ovsx"
180180
- run: echo "XML_SERVER_VERSION=$(cat package.json | jq -r .xmlServer.version)" >> $GITHUB_ENV
181-
- run: echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
182181
- name: Set the link to download the binary server
183182
env:
184183
downloadLocation: https://github.com/redhat-developer/vscode-xml
@@ -190,15 +189,15 @@ jobs:
190189
run: |
191190
npm install
192191
npm run vscode:prepublish
193-
- run: |
194-
mkdir server/
195-
mv lemminx-uber-jar/org.eclipse.lemminx*-uber.jar server/
196192
- name: Prepare Pre-Release
197193
if: ${{ github.event_name == 'schedule' || inputs.publishPreRelease == 'true' }}
198194
run: |
199195
npx gulp prepare_pre_release
200-
echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
201196
echo "publishPreReleaseFlag=--pre-release" >> $GITHUB_ENV
197+
- run: |
198+
mkdir server/
199+
mv lemminx-uber-jar/org.eclipse.lemminx*-uber.jar server/
200+
echo "EXT_VERSION=$(cat package.json | jq -r .version)" >> $GITHUB_ENV
202201
- name: Publish to VS Code Marketplace
203202
if: ${{ github.event_name == 'schedule' || inputs.publishToMarketPlace == 'true' || inputs.publishPreRelease == 'true' }}
204203
run: |

0 commit comments

Comments
 (0)