Merge branch '3006.x' into copilot/enable-copilot-in-agents-directory

Author: Copilot

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: Bug, needs-triage
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of what the bug is.
+
+**Setup**
+(Please provide relevant configs and/or SLS files (be sure to remove sensitive info. There is no general set-up of Salt.)
+
+Please be as specific as possible and give set-up details.
+
+- [ ] on-prem machine
+- [ ] VM (Virtualbox, KVM, etc. please specify)
+- [ ] VM running on a cloud service, please be explicit and add details
+- [ ] container (Kubernetes, Docker, containerd, etc. please specify)
+- [ ] or a combination, please be explicit
+- [ ] jails if it is FreeBSD
+- [ ] classic packaging
+- [ ] onedir packaging
+- [ ] used bootstrap to install
+
+
+**Steps to Reproduce the behavior**
+(Include debug logs if possible and relevant)
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Versions Report**
+<details><summary>salt --versions-report</summary>
+(Provided by running salt --versions-report. Please also mention any differences in master/minion versions.)
+
+```yaml
+PASTE HERE
+```
+</details>
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,11 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Feature Requests and Q&A
-    url: https://github.com/saltstack/salt/discussions
-    about: Please see GitHub Discussions for Feature Requests and Q&A
   - name: Salt Community Discord
     url: https://discord.com/invite/J7b7EscrAs
-    about: Please ask and answer questions here
+    about: Please ask and answer questions here.
   - name: Salt-Users Forum
     url: https://groups.google.com/forum/#!forum/salt-users
-    about: Prefer email list for Q&A? Check out the Google groups newsletter
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@
 name: Docs
 about: Issue related to Salt Documentation
 title: "[DOCS]"
-labels: documentation, needs-triage
+labels: Documentation, needs-triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/docs.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE REQUEST]"
+labels: Feature, needs-triage
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Please Note**
+If this feature request would be considered a substantial change or addition, this should go through a SEP process here https://github.com/saltstack/salt-enhancement-proposals, instead of a feature request.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,8 @@
 ---
 name: Test Failure
-about: GitHub Actions Test Failure issues
+about: Jenkins Test Failure issues
 title: "[TEST FAILURE]"
-labels: 'test-failure'
+labels: 'Test-Failure'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/test-failure.md

@@ -25,25 +25,22 @@ runs:
   using: composite
 
   steps:
-    - name: Get Hash For Onedir Deps Cache
-      id: onedir-deps-hash
-      shell: bash
-      run: |
-        HASH=$(python3 .github/scripts/hash-files.py \
-          '.relenv/**/*.xz' \
-          'requirements/static/pkg/*/*.txt' \
-          'tools/pkg/build.py' \
-          '.github/actions/build-onedir-deps/action.yml' \
-          '.github/workflows/build-deps-onedir-*.yml' \
-          'cicd/shared-gh-workflows-context.yml')
-        echo "hash=${HASH}" | tee -a "$GITHUB_OUTPUT"
-
     - name: Cache Deps Onedir Package Directory
       id: onedir-pkg-cache
       uses: ./.github/actions/cache
       with:
         path: artifacts/${{ inputs.package-name }}
-        key: ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ steps.onedir-deps-hash.outputs.hash }}
+        key: >
+          ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{
+            hashFiles(
+              format('{0}/.relenv/**/*.xz', github.workspace),
+              'requirements/static/pkg/*/*.txt',
+              'tools/pkg/build.py',
+              '.github/actions/build-onedir-deps/action.yml',
+              '.github/workflows/build-deps-onedir-*.yml',
+              'cicd/shared-gh-workflows-context.yml'
+            )
+          }}
 
     - name: Install Salt Onedir Package Dependencies
       shell: bash

.github/actions/build-onedir-deps/action.yml

@@ -31,9 +31,9 @@ runs:
       id: venv-hash
       shell: bash
       run: |
-        FILES_HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/*.txt' 'tools/**/*.py')
         VENV_NAME_HASH=$(echo "${{ inputs.cache-prefix }}|${{ github.workflow }}|${{
-          steps.get-python-version.outputs.version-sha256sum }}|${FILES_HASH}"  | sha256sum | cut -d ' ' -f 1)
+          steps.get-python-version.outputs.version-sha256sum }}|${{
+          hashFiles('requirements/**/*.txt', 'tools/**/*.py') }}"  | sha256sum | cut -d ' ' -f 1)
         echo "TOOLS_VIRTUALENV_CACHE_SEED=$VENV_NAME_HASH" | tee -a "${GITHUB_ENV}"
         echo "venv-hash=$VENV_NAME_HASH" | tee -a "${GITHUB_OUTPUT}"
 

.github/actions/setup-python-tools-scripts/action.yml

@@ -4,48 +4,48 @@
 newIssueWelcomeComment: >
   Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have
   a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as
-  possible. In the meantime, here's some information that may help as you continue your Salt
+  possible. In the meantime, here’s some information that may help as you continue your Salt
   journey.
 
   Please be sure to review our [Code of Conduct](https://github.com/saltstack/salt/blob/master/CODE_OF_CONDUCT.md).
   Also, check out some of our community
   resources including:
 
-    - [Salt's Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
+    - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
     - [Join our Community Discord](https://discord.com/invite/J7b7EscrAs)
     - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
-    - [GitHub Discussions](https://github.com/saltstack/salt/discussions)
+    - [Community Wiki](https://github.com/saltstack/community/wiki)
 
   There are lots of ways to get involved in our community. Every month, there are around a dozen
   opportunities to meet with other contributors and the Salt Core team and collaborate in real
   time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
 
-  If you have additional questions, email us at saltproject.pdl@broadcom.com. We're glad
-  you've joined our community and look forward to doing awesome things with
+  If you have additional questions, email us at saltproject.pdl@broadcom.com. We’re glad
+  you’ve joined our community and look forward to doing awesome things with
   you!
 
 # Comment to be posted to on PRs from first time contributors in your repository
 newPRWelcomeComment: >
   Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have
   a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as
-  possible. In the meantime, here's some information that may help as you continue your Salt
+  possible. In the meantime, here’s some information that may help as you continue your Salt
   journey.
 
   Please be sure to review our [Code of Conduct](https://github.com/saltstack/salt/blob/master/CODE_OF_CONDUCT.md).
   Also, check out some of our community
   resources including:
 
-    - [Salt's Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
+    - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
     - [Join our Community Discord](https://discord.com/invite/J7b7EscrAs)
     - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
-    - [GitHub Discussions](https://github.com/saltstack/salt/discussions)
+    - [Community Wiki](https://github.com/saltstack/community/wiki)
 
   There are lots of ways to get involved in our community. Every month, there are around a dozen
   opportunities to meet with other contributors and the Salt Core team and collaborate in real
   time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
 
-  If you have additional questions, email us at saltproject.pdl@broadcom.com. We're glad
-  you've joined our community and look forward to doing awesome things with
+  If you have additional questions, email us at saltproject.pdl@broadcom.com. We’re glad
+  you’ve joined our community and look forward to doing awesome things with
   you!
 
 # Comment to be posted to on pull requests merged by a first time user