fix generated url in release process

Signed-off-by: Jorge Aguilera <[email protected]>
nextflow-io · Jul 2, 2024 · 710ba9a · 710ba9a
1 parent 0d75d98
commit 710ba9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: release
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'
 
 permissions:
   contents: write
@@ -34,10 +34,10 @@ jobs:
           architecture: x64
 
       - name: Compile
-        run: ./gradlew assemble
+        run: ./gradlew assemble -P version=${{ github.ref }}
 
       - name: Tests
-        run: ./gradlew check
+        run: ./gradlew check -P version=${{ github.ref }}
         env:
           GRADLE_OPTS: '-Dorg.gradle.daemon=false'
 
@@ -52,27 +52,16 @@ jobs:
           java-version: '19'
           distribution: 'temurin'
           architecture: x64
-      - name: version
-        run: echo "::set-output name=version::$(./gradlew properties -q | awk '/^version:/ {print $2}')"
-        id: version
-
-      - name: release
-        uses: actions/create-release@v1
-        id: create_release
-        with:
-          draft: false
-          prerelease: false
-          release_name: v${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref }}
-          body_path: CHANGELOG.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
       - name: build artifacts
-        run: ./gradlew jsonPlugin -x test
+        run: ./gradlew clean jsonPlugin -x test -P version=${{ github.ref }}
 
       - name: Upload artifact and release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
+          draft: false
+          prerelease: false
+          body_path: CHANGELOG.md
+          name: Version ${{ github.ref }}
           files: |
             ./plugins/nf-nomad/build/plugin/*
diff --git a/buildSrc/src/main/groovy/nextflow/gradle/plugins/JsonPluginTask.groovy b/buildSrc/src/main/groovy/nextflow/gradle/plugins/JsonPluginTask.groovy
@@ -37,7 +37,7 @@ abstract class JsonPluginTask extends DefaultTask{
 
 
     protected String resolveURL(){
-        "${downloadUrl.get()}/v${project.version}/${project.name}-${project.version}.zip"
+        "${downloadUrl.get()}/${project.version}/${project.name}-${project.version}.zip"
     }
 
     protected static String now() {