Get update from main, fix conflict

Signed-off-by: EdricCua <[email protected]>

.github/ISSUE_TEMPLATE/flaky-ci-test-issue.yml

@@ -5,133 +5,132 @@ labels: ["bug", "flaky-test"]
 assignees: []
 
 body:
-- type: markdown
-  attributes:
-    value: |
-      ## Description of the Flaky Test
-
-- type: input
-  id: test-name
-  attributes:
-    label: Test Name
-    description: Name of the test that is flaky
-    placeholder: e.g., test_example
-
-- type: input
-  id: test-location
-  attributes:
-    label: Test Location
-    description: File and line number or test suite
-    placeholder: e.g., test_suite.py line 42
-
-- type: input
-  id: failure-permlink
-  attributes:
-    label: Failure Permlink
-    description: Permlink to the failure line in the test run
-    placeholder: e.g., https://ci.example.com/build/123
-
-- type: input
-  id: frequency
-  attributes:
-    label: Frequency
-    description: How often does the test fail?
-    placeholder: e.g., 1 in 10 runs
-
-- type: markdown
-  attributes:
-    value: |
-      ## Steps to Reproduce
-
-- type: textarea
-  id: steps-to-reproduce
-  attributes:
-    label: Steps to Reproduce
-    description: List the steps required to reproduce the flaky test
-    placeholder: 
-      1. Step 1
-      2. Step 2
-      3. Step 3
-
-- type: markdown
-  attributes:
-    value: |
-      ## Additional Context
-
-- type: input
-  id: system-information
-  attributes:
-    label: System Information
-    description: Operating system, CI environment, etc.
-    placeholder: e.g., Ubuntu 20.04, GitHub Actions
-
-- type: input
-  id: language-and-version
-  attributes:
-    label: Language and Version
-    description: Programming language and its version
-    placeholder: e.g., Python 3.8
-
-- type: input
-  id: engine-version
-  attributes:
-    label: Engine Version
-    description: Engine version used
-    placeholder: e.g., v6.2
-
-- type: textarea
-  id: logs
-  attributes:
-    label: Logs
-    description: Include any relevant logs or error messages
-    placeholder: Paste logs here...
-
-- type: textarea
-  id: screenshots
-  attributes:
-    label: Screenshots
-    description: If applicable, add screenshots to help explain the issue
-    placeholder: Paste screenshots here...
-
-- type: input
-  id: glide-version
-  attributes:
-    label: Glide Version
-    description: Glide version used
-    placeholder: e.g., 1.2.3
-
-- type: markdown
-  attributes:
-    value: |
-      ## Expected Behavior
-
-- type: textarea
-  id: expected-behavior
-  attributes:
-    label: Expected Behavior
-    description: Describe what you expected to happen
-    placeholder: Describe the expected behavior...
-
-- type: markdown
-  attributes:
-    value: |
-      ## Actual Behavior
-
-- type: textarea
-  id: actual-behavior
-  attributes:
-    label: Actual Behavior
-    description: Describe what actually happened
-    placeholder: Describe the actual behavior...
-
-- type: markdown
-  attributes:
-    value: |
-      ## Possible Fixes
-
-- type: textarea
-  id: possible-fixes
-  attributes:
-    label: Possible Fixes
-    description: If you have any insight into what might be causing the flakiness, mention it here
-    placeholder: Describe possible fixes...
+    - type: markdown
+      attributes:
+          value: |
+              ## Description of the Flaky Test
+
+    - type: input
+      id: test-name
+      attributes:
+          label: Test Name
+          description: Name of the test that is flaky
+          placeholder: e.g., test_example
+
+    - type: input
+      id: test-location
+      attributes:
+          label: Test Location
+          description: File and line number or test suite
+          placeholder: e.g., test_suite.py line 42
+
+    - type: input
+      id: failure-permlink
+      attributes:
+          label: Failure Permlink
+          description: Permlink to the failure line in the test run
+          placeholder: e.g., https://ci.example.com/build/123
+
+    - type: input
+      id: frequency
+      attributes:
+          label: Frequency
+          description: How often does the test fail?
+          placeholder: e.g., 1 in 10 runs
+
+    - type: markdown
+      attributes:
+          value: |
+              ## Steps to Reproduce
+
+    - type: textarea
+      id: steps-to-reproduce
+      attributes:
+          label: Steps to Reproduce
+          description: List the steps required to reproduce the flaky test
+          placeholder: 1. Step 1
+              2. Step 2
+              3. Step 3
+
+    - type: markdown
+      attributes:
+          value: |
+              ## Additional Context
+
+    - type: input
+      id: system-information
+      attributes:
+          label: System Information
+          description: Operating system, CI environment, etc.
+          placeholder: e.g., Ubuntu 20.04, GitHub Actions
+
+    - type: input
+      id: language-and-version
+      attributes:
+          label: Language and Version
+          description: Programming language and its version
+          placeholder: e.g., Python 3.8
+
+    - type: input
+      id: engine-version
+      attributes:
+          label: Engine Version
+          description: Engine version used
+          placeholder: e.g., v6.2
+
+    - type: textarea
+      id: logs
+      attributes:
+          label: Logs
+          description: Include any relevant logs or error messages
+          placeholder: Paste logs here...
+
+    - type: textarea
+      id: screenshots
+      attributes:
+          label: Screenshots
+          description: If applicable, add screenshots to help explain the issue
+          placeholder: Paste screenshots here...
+
+    - type: input
+      id: glide-version
+      attributes:
+          label: Glide Version
+          description: Glide version used
+          placeholder: e.g., 1.2.3
+
+    - type: markdown
+      attributes:
+          value: |
+              ## Expected Behavior
+
+    - type: textarea
+      id: expected-behavior
+      attributes:
+          label: Expected Behavior
+          description: Describe what you expected to happen
+          placeholder: Describe the expected behavior...
+
+    - type: markdown
+      attributes:
+          value: |
+              ## Actual Behavior
+
+    - type: textarea
+      id: actual-behavior
+      attributes:
+          label: Actual Behavior
+          description: Describe what actually happened
+          placeholder: Describe the actual behavior...
+
+    - type: markdown
+      attributes:
+          value: |
+              ## Possible Fixes
+
+    - type: textarea
+      id: possible-fixes
+      attributes:
+          label: Possible Fixes
+          description: If you have any insight into what might be causing the flakiness, mention it here
+          placeholder: Describe possible fixes...

.github/ISSUE_TEMPLATE/inquiry.yml

@@ -5,69 +5,69 @@ labels: ["Inquiry"]
 assignees: []
 
 body:
-- type: markdown
-  attributes:
-    value: |
-      ## Question
+    - type: markdown
+      attributes:
+          value: |
+              ## Question
 
-- type: textarea
-  id: question-description
-  attributes:
-    label: Inquiry
-    description: Describe your inquiry in detail
-    placeholder: Describe your inquiry...
+    - type: textarea
+      id: question-description
+      attributes:
+          label: Inquiry
+          description: Describe your inquiry in detail
+          placeholder: Describe your inquiry...
 
-- type: markdown
-  attributes:
-    value: |
-      ## Language and Version
+    - type: markdown
+      attributes:
+          value: |
+              ## Language and Version
 
-- type: input
-  id: language
-  attributes:
-    label: Language
-    description: Optional - Specify the programming language
-    placeholder: e.g., Python, Java
+    - type: input
+      id: language
+      attributes:
+          label: Language
+          description: Optional - Specify the programming language
+          placeholder: e.g., Python, Java
 
-- type: input
-  id: language-version
-  attributes:
-    label: Language Version
-    description: Optional - Specify the version of the language
-    placeholder: e.g., 3.8, 11
+    - type: input
+      id: language-version
+      attributes:
+          label: Language Version
+          description: Optional - Specify the version of the language
+          placeholder: e.g., 3.8, 11
 
-- type: markdown
-  attributes:
-    value: |
-      ## Engine Version
+    - type: markdown
+      attributes:
+          value: |
+              ## Engine Version
 
-- type: input
-  id: engine-version
-  attributes:
-    label: Engine Version
-    description: Optional - Specify the engine version
-    placeholder: e.g., ValKey 8.0.1, Redis-OSS 6.2.14
+    - type: input
+      id: engine-version
+      attributes:
+          label: Engine Version
+          description: Optional - Specify the engine version
+          placeholder: e.g., ValKey 8.0.1, Redis-OSS 6.2.14
 
-- type: markdown
-  attributes:
-    value: |
-      ## Operating System
+    - type: markdown
+      attributes:
+          value: |
+              ## Operating System
 
-- type: input
-  id: os
-  attributes:
-    label: Operating System
-    description: Optional - Specify the operating system
-    placeholder: e.g., MacOs 14, Ubuntu 20.04
+    - type: input
+      id: os
+      attributes:
+          label: Operating System
+          description: Optional - Specify the operating system
+          placeholder: e.g., MacOs 14, Ubuntu 20.04
 
-- type: markdown
-  attributes:
-    value: |
-      ## Additional Technical Information
+    - type: markdown
+      attributes:
+          value: |
+              ## Additional Technical Information
 
-- type: textarea
-  id: additional-info
-  attributes:
-    label: Additional Technical Information
-    description: Optional - Provide any additional technical information
-    placeholder: Additional context or details...
+    - type: textarea
+      id: additional-info
+      attributes:
+          label: Additional Technical Information
+          description: Optional - Provide any additional technical information
+          placeholder: Additional context or details...