From 98a2240c8ed7880ecd4ab8adf2bca61251e26efa Mon Sep 17 00:00:00 2001
From: adschr <adam.schreiber@solarwinds.com>
Date: Fri, 3 Jan 2025 10:40:25 +0100
Subject: [PATCH] chore: adjust GH setup

Add 'Technical Improvement' issue type and make them separate from feature requests
Add triggering of pipeline on main and release branches post-merge
---
 .github/ISSUE_TEMPLATE/bug_report.yaml           |  1 +
 .github/ISSUE_TEMPLATE/feature_request.yaml      |  3 ++-
 .../ISSUE_TEMPLATE/technical_improvement.yaml    | 16 ++++++++++++++++
 .github/workflows/buildAndDeploy.yml             |  3 +++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 .github/ISSUE_TEMPLATE/technical_improvement.yaml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8f8b0d3..0d303a7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -17,6 +17,7 @@ body:
       options:
         - cmd/solarwinds-otel-collector
         - exporter/solarwindsexporter
+        - extension/solarwindsextension
   - type: textarea
     attributes:
       label: Description
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 216c6b6..7f6a003 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest an idea for this project
-labels: ["enhancement", "needs triage"]
+labels: ["enhancement", "feature", "needs triage"]
 body:
   - type: dropdown
     id: component
@@ -11,6 +11,7 @@ body:
       options:
         - cmd/solarwinds-otel-collector
         - exporter/solarwindsexporter
+        - extension/solarwindsextension
   - type: textarea
     attributes:
       label: Is your feature request related to a problem? Please describe.
diff --git a/.github/ISSUE_TEMPLATE/technical_improvement.yaml b/.github/ISSUE_TEMPLATE/technical_improvement.yaml
new file mode 100644
index 0000000..0a3ce4f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/technical_improvement.yaml
@@ -0,0 +1,16 @@
+name: Technical improvement
+description: Suggest a general technical improvement for this project
+labels: ["enhancement", "maintenance", "needs triage"]
+body:
+  - type: textarea
+    attributes:
+      label: Is your suggestion related to a general technical or maintenance issue? Please describe.
+      description: A clear and concise description of what the problem is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index 7aa006d..f79a4d4 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -7,6 +7,9 @@ on:
       - "*.md"
     tags:
       - 'v*.*.*'
+    branches:
+      - main
+      - release/**
 
   pull_request:
     branches: