Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
KB-perByte authored Oct 17, 2023
2 parents a68b34f + 6099fe5 commit afea1a4
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
profile: production
exclude_paths:
- changelogs/changelog.yaml
skip_list:
# ansible-lint does not like the `import-3.11` ignore in tests/sanity/ignore-*.txt
- sanity[cannot-ignore]
12 changes: 12 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: ansible-lint
on: # yamllint disable-line rule:truthy
pull_request:
branches: ["main"]
jobs:
build:
name: Ansible Lint # Naming the build is important to use it as a status check
runs-on: ubuntu-latest
steps:
- name: Run ansible-lint
uses: ansible/ansible-lint@main # or version tag instead of 'main'
5 changes: 0 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ on: # yamllint disable-line rule:truthy
workflow_dispatch:

jobs:
ansible-lint:
uses: ansible-network/github_actions/.github/workflows/ansible-lint.yml@main
changelog:
uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
sanity:
Expand All @@ -24,11 +22,9 @@ jobs:
with:
collection_pre_install: >-
git+https://github.com/ansible-collections/ansible.utils.git
all_green:
if: ${{ always() }}
needs:
- ansible-lint
- changelog
- sanity
- unit-galaxy
Expand All @@ -38,7 +34,6 @@ jobs:
- run: >-
python -c "assert 'failure' not in
set([
'${{ needs.ansible-lint.result }}',
'${{ needs.changelog.result }}',
'${{ needs.sanity.result }}',
'${{ needs.unit-galaxy.result }}',
Expand Down
3 changes: 3 additions & 0 deletions changelogs/fragments/fix_attribute_type.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- Fix attribute types from string to str in filter plugins.
3 changes: 3 additions & 0 deletions changelogs/fragments/trivial_lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
trivial:
- "Fix lint action reference."
2 changes: 1 addition & 1 deletion plugins/filter/parse_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
It defines how to parse the CLI output and return JSON data.
- For example C(cli_data | ansible.netcommon.parse_cli(template.yml)),
in this case C(cli_data) represents cli output.
type: string
type: str
"""

EXAMPLES = r"""
Expand Down
2 changes: 1 addition & 1 deletion plugins/filter/parse_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
It defines how to parse the XML output and return JSON data.
- For example C(xml_data | ansible.netcommon.parse_xml(template.yml)),
in this case C(xml_data) represents xml data option.
type: string
type: str
"""

EXAMPLES = r"""
Expand Down
2 changes: 1 addition & 1 deletion plugins/filter/vlan_expander.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
data:
description:
- This option represents a string containing the range of vlans.
type: string
type: str
required: True
"""

Expand Down

0 comments on commit afea1a4

Please sign in to comment.