From 1aacd20caa7129becc2585cf8efff43591ad6047 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Mon, 5 Apr 2021 17:11:05 +0100
Subject: [PATCH] Backport milestone workflow fixes

---
 .github/workflows/release-milestone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
index 0cf3da10..39bc001e 100644
--- a/.github/workflows/release-milestone.yml
+++ b/.github/workflows/release-milestone.yml
@@ -45,8 +45,8 @@ jobs:
     # version to get used with tagging
     - name: Configure Milestone Version
       run: |
-        jfrog rt gradle milestoneVersion -P${{ github.event.inputs.milestone }}
-        echo PROJECT_VERSION=$(jfrog rt gradle "properties -q" | grep "version:" | awk '{print $2}')-${{ github.event.inputs.milestone }} >> $GITHUB_ENV
+        jfrog rt gradle milestoneVersion -PstatemachineMilestone=${{ github.event.inputs.milestone }}
+        echo PROJECT_VERSION=$(jfrog rt gradle "properties -q" | grep "version:" | awk '{print $2}') >> $GITHUB_ENV
     # build and publish to staging repo.
     # we've allready tested with snapshots so no need to test
     # with a release build as we are not a release train.