🔄 chore: sync with upstream

.github/DISCUSSION_TEMPLATE/accessibility.yml

@@ -2,13 +2,12 @@ labels: [Accessibility]
 body: 
 - type: markdown
   attributes: 
-   value:
-
-     ⚠️ This category is solely for discussions and feedback on [the digital accessibility of GitHub products](https://accessibility.github.com/). ⚠️
+   value: 
+    ⚠️ This category is solely for discussions and feedback on [the digital accessibility of GitHub products](https://accessibility.github.com/). ⚠️
 
     Please use this space for questions, bug reports, opportunities, and feedback related to making GitHub features accessible to users of all abilities. 
-     
-     To ensure you receive a timely response and connect with the proper team(s), please post in the correct category, questions about access, 2FA, and SMS belong in the [General category](https://github.com/orgs/community/discussions/categories/general?discussions_q=is%3Aopen+category%3AGeneral). Discussions that are posted in the wrong category may be moved. Users who post spam or violate of our [Code of Conduct](https://github.com/github/.github/blob/95e9dcb0b8b70a25cdb75de29f600812a07eb996/CODE_OF_CONDUCT.md) will be blocked.
+
+    To ensure you receive a timely response and connect with the proper team(s), please post in the correct category, questions about access, 2FA, and SMS belong in the [General category](https://github.com/orgs/community/discussions/categories/general?discussions_q=is%3Aopen+category%3AGeneral). Discussions that are posted in the wrong category may be moved. Users who post spam or violate of our [Code of Conduct](https://github.com/github/.github/blob/95e9dcb0b8b70a25cdb75de29f600812a07eb996/CODE_OF_CONDUCT.md) will be blocked.
 - type: dropdown
   attributes:
     label: Select Topic Area

.github/DISCUSSION_TEMPLATE/actions.yml

@@ -1,20 +1,64 @@
 labels: [Actions]
 body:
+- type: markdown
+  attributes:
+    value: |
+      🚀 **Welcome to the Actions Category!** 🚀
+
+      Automate, customize, and execute your software development workflows right in your repository with [GitHub Actions](https://docs.github.com/en/actions)!
+
+      **Why are you here?**
+      - **Have a Question?** Maybe you're stuck on workflow syntax, curious about best practices, or want to know how to use a specific GitHub Actions feature. Select "Question" to get help from the community!
+      - **Product Feedback?** Do you have ideas to improve GitHub Actions, or want to share what works (or doesn't) for you? Select "Product Feedback" to help shape the future of GitHub Actions.
+      - **Found a Bug?** If something isn't working as expected, let us know by selecting "Bug" so we can investigate and improve the platform.
+
+      After choosing your reason, pick the topic or product area that best matches your discussion.
+
+      **Quick links:** [Actions Documentation](https://docs.github.com/en/actions), [Workflow Syntax Guide](https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions), [Example Workflows](https://docs.github.com/en/actions/use-cases-and-examples), and [Security Best Practices](https://docs.github.com/en/actions/security-for-github-actions)
+
+      **Recent News:**
+      - [Latest Breaking Changes](https://github.blog/changelog/label/actions)
+
 - type: dropdown
+  id: reason
   attributes:
-    label: Select Topic Area
-    description: What would you like to discuss?
+    label: Why are you starting this discussion?
+    description: Tell us your goal! Are you asking a question, giving feedback, reporting a bug, or sharing something cool?
     options:
       - "Question"
       - "Product Feedback"
       - "Bug"
-      - "Show & Tell"
-      - "General"
+    default: 0
   validations:
     required: true
+- type: dropdown
+  id: topic
+  attributes:
+    label: What GitHub Actions topic or product is this about?
+    description: |
+      Choose the single topic or product area most relevant to your discussion. Only one can be selected here.
+
+      If your post covers additional themes or topics, don't worry! Our team and automation will do our best to add extra labels based on the content of your discussion details.
+
+      This helps us get you the best answers and feedback!
+    options:
+      - "ARC (Actions Runner Controller)"
+      - "Actions Runner Image"
+      - "Actions Runner"
+      - "Actions Checkout"
+      - "Actions Cache"
+      - "Workflow Deployment"
+      - "Workflow Configuration"
+      - "Schedule & Cron Jobs"
+      - "Metrics & Insights"
+      - "Misc"
+    default: 9
+  validations:
+    required: false
 - type: textarea
   attributes:
-    label: Body
-    description: Start your discussion!
+    label: Discussion Details
+    description: >-
+      Share your question, feedback, or story! Include links, code, or screenshots for more context. Tip: Reference the docs https://docs.github.com/en/actions or relevant changelogs for details.
   validations:
-    required: true
+      required: true

.github/DISCUSSION_TEMPLATE/copilot-conversations.yml

@@ -0,0 +1,49 @@
+body:
+- type: markdown
+  attributes:
+    value: |
+      #### Explore our [Copilot FAQs](https://github.com/orgs/community/discussions/144674) and [GitHub Docs](https://docs.github.com/en/copilot) for comprehensive guidance!
+      - 💡 **Quick Tip:** For general development questions or detailed code issues, try [Chat with Copilot](https://docs.github.com/en/enterprise-cloud@latest/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-github) first, it might have the answer you need before posting here.
+      - 🛠️ For bugs and feature requests related to Copilot in VS Code, please open an issue in our [VS Code repo](https://github.com/microsoft/vscode/issues). If your issue is related to Copilot Chat, please [visit our FAQ](https://aka.ms/vscode-report-ai-feedback).
+      - 🔍 Are you a student/teacher looking to enable Copilot Pro? [Read our guide](https://gh.io/faq-nd-copilot)
+- type: dropdown
+  attributes:
+    label: Select Topic Area
+    description: What would you like to discuss about GitHub Copilot? Choose your topic area. 
+    options:
+      - Question
+      - Product Feedback
+      - Bug 
+      - General
+  validations:
+    required: true
+- type: dropdown
+  id: feature-area
+  attributes:
+    label: Copilot Feature Area
+    description: Which Copilot feature or product area is your discussion related to?
+    options:
+      - General
+      - Copilot in GitHub
+      - Copilot Workspace
+      - Copilot Agent Mode
+      - Copilot Coding Agent
+      - Copilot Enterprise
+      - Account Related 
+      - VS Code
+      - Visual Studio
+      - JetBrains & Xcode
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Body
+    description: Start your discussion!
+    placeholder: >-
+      Provide a detailed description of your discussion (e.g., What issue are you facing? What feedback do you have? What question do you need answered?)
+  validations:
+    required: true
+- type: markdown
+  attributes:
+    value: |
+      #### Don't forget to mark an [answer as "solved"](https://docs.github.com/en/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion#marking-a-comment-as-an-answer) to help others with similar questions. ✅

.github/DISCUSSION_TEMPLATE/discussions.yml

@@ -1,28 +1,43 @@
+title: "<Your question or feedback about the GitHub Discussions product>"
 labels: [Discussions]
 body:
-- type: markdown
-  attributes: 
-   value: |
-     ⚠️ This category is solely for discussions and feedback on [the GitHub Discussions product](https://github.com/features/discussions). ⚠️
+  - type: markdown
+    attributes: 
+      value: |
+        ⚠️ This category is solely for discussions and feedback on [the GitHub Discussions product](https://github.com/features/discussions). ⚠️
 
-     The Discussions category is NOT meant to be a place for any old discussion regarding GitHub or programming — [the General category](https://github.com/orgs/community/discussions/categories/general) is a more appropriate space for misc topics. To ensure you receive a timely response and connect with the proper team(s), please post in the correct category by using the corresponding product category. 
+        [GitHub Discussions](https://github.com/features/discussions) is a product within GitHub that allows users to talk, ask questions, and share ideas. Discussions are meant for open-ended conversations.
 
-     NOTE: If you post in this category about topics other than GitHub Discussions, your post may be moved or deleted without warning. Users who post spam or violate of our [Code of Conduct](https://github.com/github/.github/blob/95e9dcb0b8b70a25cdb75de29f600812a07eb996/CODE_OF_CONDUCT.md) will be blocked.
-- type: dropdown
-  attributes:
-    label: Select Topic Area
-    description: What would you like to discuss?
-    options:
-      - "Question"
-      - "Product Feedback"
-      - "Bug"
-      - "Show & Tell"
-      - "General"
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Body
-    description: Start your discussion!
-  validations:
-    required: true
+        ### ✅ Dos - Use this category if your post is about
+        - How to enable or configure **GitHub Discussions** in a repository or organization
+        - Questions about **GitHub Discussions** features, such as marking answers, organizing threads or using moderation tools.
+        - Bugs or issues specifically related to **GitHub Discussions** 🐞
+        - Suggestions or feedback to improve the **GitHub Discussions** product 💬
+
+        ### 🚫 Don'ts - Please, don't use this category for:
+        - General troubleshooting, water cooler conversations or off-topic questions - have you tried General or Programming Help?
+        - Feedback that doesn't directly relate to _GitHub Discussions_, that feedback belong somewhere else, use this [quick guide](https://github.com/orgs/community/discussions/151702) to help.
+
+        ### 📚 Need help understanding how GitHub Discussions works?  
+        Read the official documentation: [GitHub Discussions Docs](https://docs.github.com/en/discussions)
+
+  - type: dropdown
+    attributes:
+      label: "Discussion Type"
+      description: What would you like to discuss?
+      options:
+        - "Product Feedback"
+        - "Question"
+        - "Bug"
+        - "Show & Tell"
+        - "General"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Discussion Content"
+      description: Start your discussion!
+    validations:
+      pattern: "^.{1000,}$"
+      regexFlags: "s"
+      note: "Must have at least 1000 characters"

.github/DISCUSSION_TEMPLATE/general.yml

@@ -1,5 +1,13 @@
-labels: [general]
+labels: [General]
 body:
+- type: markdown
+  attributes:
+   value:
+    ⚠️ The Community can not help with account-related issues, such as reinstatement requests or help to escalate your [GitHub Support](https://support.github.com/contact) tickets. ⚠️
+- type: markdown
+  attributes:
+    value:
+     📛 We made the decision to disable the ability to earn Achievements in our Community in order to discourage users from participating in coordinated or inauthentic activity like rapid questions and answers in order to earn badges. You can learn more about this decision in our announcement post here [Achievements will no longer be available in the Community](https://github.com/orgs/community/discussions/106536) 📛
 - type: dropdown
   attributes:
     label: Select Topic Area

.github/DISCUSSION_TEMPLATE/github-education.yml

@@ -2,34 +2,36 @@ body:
   - type: markdown
     attributes:
       value: |
-        ## We’re really excited you’re here! 👋 🎉  Welcome to the GitHub Education community! 🎒 
+        #### Welcome! Before You Create a New Post...  
   - type: markdown
     attributes:
       value: |
-        Before jumping into your conversation please read the hints and tips below to help you create a great discussion topic others would more likely respond to 💬
+        Please read the **hints and tips** below. Your question might already have an answer waiting for you! 
+        If you are new here and are unsure where to start, please check out our [Quick Start Guide](https://github.com/orgs/community/discussions/141947). 👈
   - type: markdown
     attributes:
       value: |
-        #### Are you asking for help with your GitHub Global Campus application process?
-        * **Help us to help you** 👍 Provide as much relevant information about your application as possible including posting your **latest rejection reasons**.
-        * Do **not post** any personal information on the discussions boards e.g images of your evidence. 
+        ### Let's first see if you need to create a discussion 🧠🔮 <sub><sup>_We will attempt to read your mind..._</sup></sub>
+        - **"Where are my academic benefits?"** <img width="5%" src="https://github.com/user-attachments/assets/940b5b29-2c08-4753-9b17-557b28ee93f2" /> Do you have this approved status image? You'll usually receive your benefits after 3 days of this approval status. Patience, my friend, patience! 😎  **"Awesome. But it's been 5 days?"** 😅 If you haven’t received your benefits within 5 days of your approval status, then yes, create this discussion and we'll assist!
+        - **Check out our [SDP FAQ](https://gh.io/sdp-faq-nd) and [Educators FAQ](https://github.com/orgs/community/discussions/145312)** – It has the most commonly asked questions when applying including: 
+          * ⏱️ [How long after I’ve been approved will I receive my academic benefits?](https://gh.io/faq-nd-long)
+          * 📩 [I don't have a school-issued email address, what other official proof of enrollment is accepted?](https://github.com/orgs/community/discussions/111352#i-dont-have-a-school-issued-email-address)
+          * ✈️ 💻 [How to enable Copilot Pro for GitHub Education verified students/teachers?](https://gh.io/faq-nd-copilot)
+        ### Thanks, but I still want to join the conversation! 💬😄 <sub><sup>_Love it! We're here for the banter_</sup></sub>
+        - **Can’t find your answer in our [SDP FAQ](https://gh.io/sdp-faq-nd)?** Then provide as much relevant information about your application as possible including posting your latest rejection reasons.
+        - **Calling all verified Educators** 📣 Did you know we have an exclusive teachers only discussions board you can access after being verified? 🤫 [Check it out here](https://github.com/community/Global-Campus-Teachers/discussions?new-dis) 👈 
 
-        #### Need Octernships project guidance?
-        * We **can not** provide specific project guidance and can only recommend you [reach out to your Octernships project maintainers](https://github.com/orgs/community/discussions/51456#discussioncomment-5542896) for instructions or to raise a bug.
+        Once you're ready to post, feel free to jump in. **We’re here to help!** 🌟 Ensure you have read our [Code of Conduct](https://github.com/community/community/blob/main/CODE_OF_CONDUCT.md). Remember **do not post** any personal information on the discussions boards e.g images of your evidence.
   - type: textarea
     id: conversation
     attributes:
       label: Hi everyone, 
-      description: "Start your conversation below👇. Ensure you have read and adhere to our [Code of Conduct](https://github.com/community/community/blob/main/CODE_OF_CONDUCT.md). For more expectations around feedback responses - check out the [Community ReadMe](https://github.com/community/community#from-a-suggestion-to-a-shipped-feature)."
+      description: 
     validations:
       required: true
   - type: markdown
     attributes:
       value: |
-        #### Anything else I should check before posting? 🤔
-        * Check out the available documentation answering commonly asked questions: [Octernships FAQs](https://github.com/orgs/community/discussions/49380); [Student Developer Pack Application & FAQs](https://github.com/orgs/community/discussions/17814); [Campus Experts](https://education.github.com/students/experts).
-        * Search these boards for previous threads describing similar problems. ⭐ ***Hint:*** *search by rejection reason*
-  - type: markdown
-    attributes:
-      value: |
-        Remember to mark an [answer as "solved"](https://docs.github.com/en/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion#marking-a-comment-as-an-answer) to help others with similar questions. ✅
+        #### Anything else I could do to make my experience here more rewarding? 🤔
+        * Remember to mark an [answer as "solved"](https://docs.github.com/en/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion#marking-a-comment-as-an-answer) to help others with similar questions. ✅
+        * Praise generously 💖 Thank members who have helped you and continue to support others within the community. ✨

.github/DISCUSSION_TEMPLATE/copilot.yml → .github/DISCUSSION_TEMPLATE/npm.yml

@@ -1,4 +1,4 @@
-labels: [Copilot]
+labels: [npm]
 body:
 - type: dropdown
   attributes:

.github/DISCUSSION_TEMPLATE/projects-and-issues.yml

@@ -6,7 +6,7 @@ body:
         feature areas
         [Issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/about-issues)
         and
-        [Projects](https://docs.github.com/en/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects)
+        [Projects](https://docs.github.com/en/issues/planning-and-tracking-with-projects/learning-about-projects/about-projects). 
         ⚠️
   - type: dropdown
     attributes:
@@ -40,17 +40,10 @@ body:
       label: Body
       description: Start your discussion!
       placeholder: >-
-        STOP! This category is only for discussions on GitHub Issues and
-        GitHub Projects. GitHub Issues are the issues you open in a repo to
+        STOP! GitHub Issues refers to the issues you open in a repo to
         track your work. NOT issues you are having with GitHub or a GitHub
         product. GitHub Projects are project boards you can create for example
-        Kanban boards, to track your work. NOT projects on GitHub.
-
-
-        We know the "issues" and ‘projects” naming conventions can be a little confusing.
-
-
-        To report an issue with another area of the GitHub, use the correct product category, if one does not exist, use the General category. To ensure you receive a timely response and connect with the proper team(s) make sure you are posting  in the correct category.
+        Kanban boards, to track your work. NOT projects on GitHub. To ensure you receive a timely response by the correct team(s), make sure you are posting in the right category.
     validations:
       required: true
   - type: checkboxes

.github/actions/add_feedback_comment

@@ -39,5 +39,7 @@ puts "Checking #{node_id} for an existing feedback comment"
 
 exit unless Discussion.should_comment?(discussion_number: discussion_number, owner: owner, repo: repo)
 
+puts "Adding a comment to the discussion"
+
 discussion = Discussion.new(node_id)
 discussion.add_comment(body: body)