From 570bbcfde446bd222a59be4f3f654c98a90b4ac5 Mon Sep 17 00:00:00 2001
From: Euripedes Rocha Filho <rocha.euripedes@espressif.com>
Date: Tue, 24 Mar 2026 13:56:52 +0100
Subject: [PATCH] ci: Update jira sync github action

---
 .github/workflows/issue_comment.yml | 24 -------------
 .github/workflows/new_issues.yml    | 24 -------------
 .github/workflows/new_prs.yml       | 33 ------------------
 .github/workflows/sync-jira.yml     | 54 +++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 81 deletions(-)
 delete mode 100644 .github/workflows/issue_comment.yml
 delete mode 100644 .github/workflows/new_issues.yml
 delete mode 100644 .github/workflows/new_prs.yml
 create mode 100644 .github/workflows/sync-jira.yml

diff --git a/.github/workflows/issue_comment.yml b/.github/workflows/issue_comment.yml
deleted file mode 100644
index a0f1796..0000000
--- a/.github/workflows/issue_comment.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Sync issue comments to JIRA
-
-# 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
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: write
-    steps:
-      - uses: actions/checkout@master
-      - name: Sync issue comments to JIRA
-        uses: espressif/github-actions/sync_issues_to_jira@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JIRA_PASS: ${{ secrets.JIRA_PASS }}
-          JIRA_PROJECT: IDFGH
-          JIRA_COMPONENT: esp-mqtt
-          JIRA_URL: ${{ secrets.JIRA_URL }}
-          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_issues.yml b/.github/workflows/new_issues.yml
deleted file mode 100644
index 7e0b2be..0000000
--- a/.github/workflows/new_issues.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Sync issues to Jira
-
-# 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
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: write
-    steps:
-      - uses: actions/checkout@master
-      - name: Sync GitHub issues to Jira project
-        uses: espressif/github-actions/sync_issues_to_jira@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JIRA_PASS: ${{ secrets.JIRA_PASS }}
-          JIRA_PROJECT: IDFGH
-          JIRA_COMPONENT: esp-mqtt
-          JIRA_URL: ${{ secrets.JIRA_URL }}
-          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/new_prs.yml b/.github/workflows/new_prs.yml
deleted file mode 100644
index a6795f1..0000000
--- a/.github/workflows/new_prs.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Sync remain PRs to Jira
-
-# 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 * * * *"
-
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in issue_comment.yml
-concurrency: jira_issues
-
-jobs:
-  sync_prs_to_jira:
-    name: Sync PRs to Jira
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Sync PRs to Jira project
-        uses: espressif/github-actions/sync_issues_to_jira@master
-        with:
-          cron_job: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JIRA_PASS: ${{ secrets.JIRA_PASS }}
-          JIRA_PROJECT: IDFGH
-          JIRA_COMPONENT: esp-mqtt
-          JIRA_URL: ${{ secrets.JIRA_URL }}
-          JIRA_USER: ${{ secrets.JIRA_USER }}
diff --git a/.github/workflows/sync-jira.yml b/.github/workflows/sync-jira.yml
new file mode 100644
index 0000000..43b86c1
--- /dev/null
+++ b/.github/workflows/sync-jira.yml
@@ -0,0 +1,54 @@
+name: 🔷 Sync to Jira
+
+run-name: >
+  Sync to Jira -
+  ${{ github.event_name == 'issue_comment' && 'Issue Comment' ||
+      github.event_name == 'schedule' && 'New Pull Requests' ||
+      github.event_name == 'issues' && 'New Issue' ||
+      github.event_name == 'workflow_dispatch' && 'Manual Sync' }}
+
+on:
+  issues:
+    types: [opened]
+  issue_comment:
+    types: [created, edited, deleted]
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
+    inputs:
+      action:
+        description: "Action to be performed"
+        required: true
+        default: "mirror-issues"
+      issue-numbers:
+        description: "Issue numbers to sync (comma-separated)"
+        required: true
+
+jobs:
+  sync-to-jira:
+    name: >
+      Sync to Jira -
+      ${{ github.event_name == 'issue_comment' && 'Issue Comment' ||
+          github.event_name == 'schedule' && 'New Pull Requests' ||
+          github.event_name == 'issues' && 'New Issue' ||
+          github.event_name == 'workflow_dispatch' && 'Manual Sync' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Run synchronization to Jira
+        uses: espressif/sync-jira-actions@v1
+        with:
+          cron_job: ${{ github.event_name == 'schedule' && 'true' || '' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JIRA_PASS: ${{ secrets.JIRA_PASS }}
+          JIRA_PROJECT: IDFGH
+          JIRA_COMPONENT: esp-mqtt
+          JIRA_URL: ${{ secrets.JIRA_URL }}
+          JIRA_USER: ${{ secrets.JIRA_USER }}