Test Option.

Signed-off-by: Roland Grunberg <[email protected]>
rgrunber · Nov 2, 2023 · 1b947ed · 1b947ed
1 parent fe2d4a8
commit 1b947ed
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,8 +5,8 @@ on:
       - cron: '0 8 * * *'
     workflow_dispatch:
       inputs:
-        JDT_LS_DOWNLOAD_PATH:
-          description: 'The release version of JDT-LS to use.'
+        JDT_LS_VERSION:
+          description: 'The (optional) release version (including qualifier) of JDT-LS to use.'
           type: string
         publishPreRelease:
           description: 'Publish a pre-release ?'
@@ -66,7 +66,7 @@ jobs:
     if: ${{ needs.should-build-change.outputs.repo-cache-hit != 'true' || github.event_name != 'schedule' }}
     steps:
       - name: Checkout JDT-LS
-        if: "${{ inputs.JDT_LS_DOWNLOAD_PATH != '' }}"
+        if: "${{ inputs.JDT_LS_VERSION != '' }}"
         uses: actions/checkout@v2
         with:
           repository: eclipse-jdtls/eclipse.jdt.ls
@@ -84,7 +84,7 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
       - name: Build JDT-LS
-        if: "${{ inputs.JDT_LS_DOWNLOAD_PATH == '' }}"
+        if: "${{ inputs.JDT_LS_VERSION == '' }}"
         run: |
           ./mvnw clean verify -B -DskipTests -Pserver-distro
           mkdir ../staging
@@ -98,9 +98,10 @@ jobs:
       - name: Install NodeJS dependencies
         run: npm install -g typescript "@vscode/vsce" "ovsx"
       - name: Download JDT-LS Release
-        if: "${{ inputs.JDT_LS_DOWNLOAD_PATH != '' }}"
+        if: "${{ inputs.JDT_LS_VERSION != '' }}"
         run: |
-          curl -Lo jdt-language-server-release.tar.gz https://download.eclipse.org/jdtls/milestones/${{ inputs.JDT_LS_DOWNLOAD_PATH }}
+          version=`echo ${{ inputs.JDT_LS_VERSION }} | cut -d- -f1`
+          curl -LO https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${{ inputs.JDT_LS_VERSION }}.tar.gz
       - name: Build vscode-java
         run: |
           npm install
@@ -149,7 +150,7 @@ jobs:
         uses: "marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.EXT_VERSION }}"
+          automatic_release_tag: "v${{ env.EXT_VERSION }}"
           draft: true
           files: |
             java-*-${{ env.EXT_VERSION }}-${{github.run_number}}.vsix