@@ -52,22 +52,28 @@ runs:
5252 id : determine-current-version
5353 if : ${{ !inputs.jira-new-version-name }}
5454 shell : bash
55+ env :
56+ INPUT_VERSION : ${{ inputs.jira-version-name || env.JIRA_VERSION_NAME }}
57+ FETCHED_VERSION : ${{ steps.get-jira-version.outputs.jira-version-name }}
5558 run : |
56- if [[ -n "${{ inputs.jira-version-name || env.JIRA_VERSION_NAME }} " ]]; then
57- CURRENT_VERSION="${{ inputs.jira-version-name || env.JIRA_VERSION_NAME }} "
59+ if [[ -n "$INPUT_VERSION " ]]; then
60+ CURRENT_VERSION="$INPUT_VERSION "
5861 else
59- CURRENT_VERSION="${{ steps.get-jira-version.outputs.jira-version-name }} "
62+ CURRENT_VERSION="$FETCHED_VERSION "
6063 fi
6164 echo "current-version-name=$CURRENT_VERSION" >> $GITHUB_OUTPUT
6265
6366 - name : Determine New Jira Version
6467 id : determine-new-version-name
6568 shell : bash
69+ env :
70+ NEW_VERSION_INPUT : ${{ inputs.jira-new-version-name }}
71+ CURRENT_VERSION_OUTPUT : ${{ steps.determine-current-version.outputs.current-version-name }}
6672 run : |
67- if [[ -n "${{ inputs.jira-new-version-name }} " ]]; then
68- NEW_VERSION="${{ inputs.jira-new-version-name }} "
73+ if [[ -n "$NEW_VERSION_INPUT " ]]; then
74+ NEW_VERSION="$NEW_VERSION_INPUT "
6975 else
70- NEW_VERSION=$(echo "${{ steps.determine-current-version.outputs.current-version-name }} " | awk -F. '{$NF+=1; print}' OFS='.')
76+ NEW_VERSION=$(echo "$CURRENT_VERSION_OUTPUT " | awk -F. '{$NF+=1; print}' OFS='.')
7177 fi
7278 echo "new-version-name=$NEW_VERSION" >> $GITHUB_OUTPUT
7379
@@ -79,16 +85,17 @@ runs:
7985 JIRA_TOKEN : ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }}
8086 JIRA_PROD_URL : " https://sonarsource.atlassian.net/"
8187 JIRA_SANDBOX_URL : " https://sonarsource-sandbox-608.atlassian.net/"
88+ PROJECT_KEY_INPUT : ${{ inputs.jira-project-key || env.JIRA_PROJECT_KEY }}
89+ VERSION_NAME : ${{ steps.determine-new-version-name.outputs.new-version-name }}
90+ JIRA_URL : ${{ ((inputs.use-jira-sandbox || env.USE_JIRA_SANDBOX) == 'true') && env.JIRA_SANDBOX_URL || env.JIRA_PROD_URL }}
8291 run : |
83- PROJECT_KEY="${{ inputs.jira-project-key || env.JIRA_PROJECT_KEY }}"
84-
85- if [[ -z "$PROJECT_KEY" ]]; then
92+ if [[ -z "$PROJECT_KEY_INPUT" ]]; then
8693 echo "::error::Both jira-project-key input and JIRA_PROJECT_KEY environment variable are missing. One must be provided."
8794 exit 1
8895 fi
8996
9097 python ${{ github.action_path }}/create_jira_version.py \
91- --project-key="$PROJECT_KEY " \
92- --version-name="${{ steps.determine-new-version-name.outputs.new-version-name }} " \
93- --jira-url="${{ ((inputs.use-jira-sandbox || env.USE_JIRA_SANDBOX) == 'true') && env.JIRA_SANDBOX_URL || env.JIRA_PROD_URL }} " \
98+ --project-key="$PROJECT_KEY_INPUT " \
99+ --version-name="$VERSION_NAME " \
100+ --jira-url="$JIRA_URL " \
94101 >> $GITHUB_OUTPUT
0 commit comments