Jira Sync - use Composite action

espressif · Sep 13, 2024 · f0bba92 · f0bba92
1 parent e759fc7
commit f0bba92
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 24 deletions.
diff --git a/.github/workflows/issue_comment.yml b/.github/workflows/issue_comment.yml
@@ -1,4 +1,4 @@
-name: Sync issue comments to JIRA
+name: Sync issue comments to JIRA (legacy caller)
 
 # This workflow will be triggered when new issue comment is created (including PR comments)
 on: issue_comment
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@master
       - name: Sync issue comments to JIRA
         # uses: espressif/sync-jira-actions@v1
-        uses: espressif/github-actions/sync_issues_to_jira@deprecate/jira-sync-action
+        uses: espressif/sync-jira-actions@change/composite-action
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JIRA_PASS: ${{ secrets.JIRA_PASS }}

diff --git a/.github/workflows/issue_comment_docker.yml b/.github/workflows/issue_comment_docker.yml
@@ -0,0 +1,20 @@
+name: Sync issue comments to JIRA (Docker; current v1)
+
+# This workflow will be triggered when new issue comment is created (including PR comments)
+on: issue_comment
+
+jobs:
+  sync_issue_comments_to_jira:
+    name: Sync Issue Comments to Jira
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Sync issue comments to JIRA
+        uses: espressif/sync-jira-actions@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFSYNTEST
+          JIRA_COMPONENT: GitHub
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_issues.yml b/.github/workflows/new_issues.yml
@@ -1,4 +1,4 @@
-name: Sync issues to Jira
+name: Sync issues to Jira (legacy caller)
 
 # This workflow will be triggered when a new issue is opened
 on: issues
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@master
       - name: Sync GitHub issues to Jira project
         # uses: espressif/sync-jira-actions@v1
-        uses: espressif/github-actions/sync_issues_to_jira@deprecate/jira-sync-action
+        uses: espressif/sync-jira-actions@change/composite-action
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JIRA_PASS: ${{ secrets.JIRA_PASS }}

diff --git a/.github/workflows/new_issues_docker.yml b/.github/workflows/new_issues_docker.yml
@@ -0,0 +1,20 @@
+name: Sync issues to Jira (Docker; current v1)
+
+# This workflow will be triggered when a new issue is opened
+on: issues
+
+jobs:
+  sync_issues_to_jira:
+    name: Sync issues to Jira
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Sync GitHub issues to Jira project
+        uses: espressif/sync-jira-actions@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFSYNTEST
+          JIRA_COMPONENT: GitHub
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_prs-docker.yml b/.github/workflows/new_prs-docker.yml
@@ -0,0 +1,24 @@
+name: Sync remain PRs to Jira (Docker; current v1)
+# This workflow will be triggered every hour, to sync remaining PRs (i.e. PRs with zero comment) to Jira project
+# Note that, PRs can also get synced when new PR comment is created
+on:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  sync_prs_to_jira:
+    name: Sync PRs to Jira
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Sync PRs to Jira project
+        uses: espressif/sync-jira-actions@v1
+        with:
+          cron_job: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFSYNTEST
+          JIRA_COMPONENT: GitHub
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_prs.yml b/.github/workflows/new_prs.yml
@@ -1,10 +1,10 @@
-name: Sync remain PRs to Jira
+name: Sync remain PRs to Jira (legacy caller)
 
 # This workflow will be triggered every hour, to sync remaining PRs (i.e. PRs with zero comment) to Jira project
 # Note that, PRs can also get synced when new PR comment is created
 on:
   schedule:
-    - cron: "0/5 * * * *"
+    - cron: "0 * * * *"
 
 jobs:
   sync_prs_to_jira:
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@master
       - name: Sync PRs to Jira project
         # uses: espressif/sync-jira-actions@v1
-        uses: espressif/github-actions/sync_issues_to_jira@deprecate/jira-sync-action
+        uses: espressif/sync-jira-actions@change/composite-action
         with:
           cron_job: true
         env:

diff --git a/.github/workflows/sync-jira.yml b/.github/workflows/sync-jira.yml
@@ -1,37 +1,42 @@
 ---
-name: Sync to Jira (combined)
+# This GitHub Actions workflow synchronizes GitHub issues, comments, and pull requests with Jira.
+# It triggers on new issues, issue comments, and on a scheduled basis.
+# The workflow uses a custom action to perform the synchronization with Jira (espressif/sync-jira-actions).
+
+name: Sync to Jira
+run-name: >
+  Sync to Jira -
+  ${{ github.event_name == 'issue_comment' && 'Issue Comments' ||
+      github.event_name == 'schedule' && 'New Pull Requests' ||
+      github.event_name == 'issues' && 'New Issues' }}
 
 on:
   issues: { types: [opened] }
   issue_comment: { types: [created, edited, deleted] }
-  schedule: [{ cron: '0 * * * *' }]
+  schedule: [cron: '0 * * * *']
 
 jobs:
-  sync_to_jira:
+  sync-to-jira:
     name: >
-      Sync to Jira - 
-      ${{ github.event_name == 'issue_comment' && 'Issue Comments' || 
-          github.event_name == 'schedule' && 'New Pull Requests' || 
+      Sync to Jira -
+      ${{ github.event_name == 'issue_comment' && 'Issue Comments' ||
+          github.event_name == 'schedule' && 'New Pull Requests' ||
           github.event_name == 'issues' && 'New Issues' }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
     steps:
       - name: Check out PR head
         uses: actions/checkout@v4
 
-      - name: Debug Event Name
-        run: |
-          echo "Event Name: ${{ github.event_name }}"
-
       - name: Sync to Jira
-        uses: espressif/sync-jira-actions@v1
-        # with:
-        #   cron_job: ${{ github.event_name == 'schedule' && 'true' || 'false' }}
+        uses: espressif/sync-jira-actions@change/v1
+        with:
+          jira-project: IDFSYNTEST
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JIRA_PASS: ${{ secrets.JIRA_PASS }}
           JIRA_URL: ${{ secrets.JIRA_URL }}
           JIRA_USER: ${{ secrets.JIRA_USER }}
-          JIRA_PROJECT: IDFSYNTEST
-          JIRA_COMPONENT: GitHub
-          JIRA_ISSUE_TYPE: Task
-          INPUT_CRON_JOB: ${{ github.event_name == 'schedule' && 'true' || '' }}  # this is kind of a hack; code of the action needs to be modified