Skip to content

Commit ad69833

Browse files
committed
Merge branch 'main' into updates-from-main-1.2.1
2 parents 498481c + 5d23ed2 commit ad69833

104 files changed

Lines changed: 5673 additions & 145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ body:
66
attributes:
77
value: |
88
Bug Report issues are for **concrete, actionable bugs** only.
9-
For debugging help or technical support, please see [our ways of contact](https://ansible-rulebook.readthedocs.io/en/latest/contributing.html)
9+
For debugging help or technical support, please see [our ways of contact](https://docs.ansible.com/projects/rulebook/en/latest/contributing.html)
1010
1111
- type: checkboxes
1212
id: terms
1313
attributes:
1414
label: Please confirm the following
1515
options:
16-
- label: I agree to follow this project's [code of conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html).
16+
- label: I agree to follow this project's [code of conduct](https://docs.ansible.com/projects/ansible/latest/community/code_of_conduct.html).
1717
required: true
1818
- label: I have checked the [current issues](https://github.com/ansible/ansible-rulebook/issues) for duplicates.
1919
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
blank_issues_enabled: true
22
contact_links:
33
- name: For debugging help or technical support
4-
url: https://ansible-rulebook.readthedocs.io/en/latest/contributing.html
4+
url: https://docs.ansible.com/projects/rulebook/en/latest/contributing.html
55
about: For general debugging or technical support please see the linked section of our docs.
66

77
- name: 📝 Ansible Code of Conduct
8-
url: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_template_chooser
8+
url: https://docs.ansible.com/projects/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_template_chooser
99
about: EDA-Controlles uses the Ansible Code of Conduct; ❤ Be nice to other members of the community. ☮ Behave.
1010

1111
- name: 💼 For Enterprise

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ body:
66
attributes:
77
value: |
88
Feature Request issues are for **feature requests** only.
9-
For debugging help or technical support, please see the [our ways of contact](https://ansible-rulebook.readthedocs.io/en/latest/contributing.html)
9+
For debugging help or technical support, please see the [our ways of contact](https://docs.ansible.com/projects/rulebook/en/latest/contributing.html)
1010
1111
- type: checkboxes
1212
id: terms
1313
attributes:
1414
label: Please confirm the following
1515
options:
16-
- label: I agree to follow this project's [code of conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html).
16+
- label: I agree to follow this project's [code of conduct](https://docs.ansible.com/projects/ansible/latest/community/code_of_conduct.html).
1717
required: true
1818
- label: I have checked the [current issues](https://github.com/ansible/ansible-rulebook/issues) for duplicates.
1919
required: true

.github/workflows/build-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525

@@ -36,12 +36,12 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v5
39+
uses: actions/checkout@v6
4040
with:
4141
fetch-depth: 0
4242

4343
- name: Set up Python
44-
uses: actions/setup-python@v5
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: 3.11
4747

.github/workflows/ci.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020

2121
- name: run commitlint
2222
uses: wagoid/commitlint-github-action@v5
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: run flake
3131
uses: ./.github/actions/run-flake
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
3838

3939
- name: run isort
4040
uses: ./.github/actions/run-isort
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v5
46+
uses: actions/checkout@v6
4747

4848
- name: black
4949
uses: psf/black@stable
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout
66-
uses: actions/checkout@v5
66+
uses: actions/checkout@v6
6767
with:
6868
fetch-depth: 0
6969

@@ -79,6 +79,21 @@ jobs:
7979
PDE_ORG_RESULTS_AGGREGATOR_UPLOAD_URL: ${{ vars.PDE_ORG_RESULTS_AGGREGATOR_UPLOAD_URL }}
8080
uses: ./.github/actions/all-tests
8181

82+
# Add PR number to coverage file for SonarCloud analysis
83+
- name: Inject PR number into coverage file
84+
if: github.event_name == 'pull_request'
85+
run: |
86+
sed -i '2i <!-- PR ${{ github.event.number }} -->' coverage.xml
87+
echo "PR Number: ${{ github.event.number }} injected into coverage file"
88+
89+
# Upload coverage artifact to Github for SonarCloud (only from Python 3.11)
90+
- name: Upload coverage as artifact
91+
if: matrix.python-version == '3.11'
92+
uses: actions/upload-artifact@v6
93+
with:
94+
name: coverage
95+
path: ./coverage.xml
96+
8297
- name: Upload coverage to Codecov
8398
uses: codecov/codecov-action@v5
8499
with:
@@ -94,7 +109,7 @@ jobs:
94109

95110
steps:
96111
- name: Checkout repository
97-
uses: actions/checkout@v5
112+
uses: actions/checkout@v6
98113
with:
99114
fetch-depth: 0
100115

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
contents: write
1414
steps:
1515
- name: Check out repository
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717

1818
- name: Set up Python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: "3.11"
2222

.github/workflows/scheduled.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: run flake
1717
uses: ./.github/actions/run-flake
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424

2525
- name: run isort
2626
uses: ./.github/actions/run-isort
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333

3434
- name: black
3535
uses: psf/black@stable
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v5
52+
uses: actions/checkout@v6
5353
with:
5454
fetch-depth: 0
5555

0 commit comments

Comments
 (0)