From 4d7dd441e5af6cc1da27128ef6399785e9f72d1c Mon Sep 17 00:00:00 2001 From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:18:31 +0100 Subject: [PATCH 1/2] - remove process job and use PR variables as they are --- .github/workflows/gajira.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/gajira.yml b/.github/workflows/gajira.yml index ab42727572..593e41fd9e 100644 --- a/.github/workflows/gajira.yml +++ b/.github/workflows/gajira.yml @@ -18,20 +18,17 @@ jobs: JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - - name: Process PR data - id: process_pr_data - run: | - repo_name=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f2 | sed 's/ *(.*)//') - pr_body="${{ github.event.pull_request.body }}" - - echo "repo_name=$repo_name" >> $GITHUB_ENV - echo "pr_body=$pr_body" >> $GITHUB_ENV - - name: Create Jira ticket id: create uses: atlassian/gajira-create@master with: project: EL issuetype: Task - summary: "Dependabot: - ${{ env.repo_name }} - ${{ github.event.pull_request.title }}" - description: ${{ env.pr_body }} \ No newline at end of file + summary: | + Dependabot: - PR# ${{github.event.number}}, ${{ github.event.pull_request.title }} + description: | + Repo link: https://github.com/${{ github.repository }} + PR no. ${{ github.event.pull_request.number }} + PR title: ${{ github.event.pull_request.title }} + PR description: ${{ github.event.pull_request.body }} + In addition, please resolve other issues, if any. From 821e31ff42b27302e77c5a5f5ba1e564430b2582 Mon Sep 17 00:00:00 2001 From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com> Date: Fri, 4 Oct 2024 14:26:43 +0100 Subject: [PATCH 2/2] - update Jira ticket layout and content --- .github/workflows/gajira.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gajira.yml b/.github/workflows/gajira.yml index 593e41fd9e..f4617f572b 100644 --- a/.github/workflows/gajira.yml +++ b/.github/workflows/gajira.yml @@ -25,10 +25,8 @@ jobs: project: EL issuetype: Task summary: | - Dependabot: - PR# ${{github.event.number}}, ${{ github.event.pull_request.title }} + Dependabot: ${{ github.event.pull_request.title }}, GitHub PR#${{github.event.number}} description: | - Repo link: https://github.com/${{ github.repository }} - PR no. ${{ github.event.pull_request.number }} - PR title: ${{ github.event.pull_request.title }} - PR description: ${{ github.event.pull_request.body }} + ${{ github.event.pull_request.body }} + Repo link: https://github.com/${{ github.repository }} In addition, please resolve other issues, if any.