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 4, 2023
2 parents ca2c392 + 2001633 commit 3114198
Show file tree
Hide file tree
Showing 16 changed files with 2,747 additions and 727 deletions.
5 changes: 5 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
profile: production

exclude_paths:
- changelogs/changelog.yaml
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
runs-on: ubuntu-latest
steps:
- name: Run ansible-lint
uses: ansible/ansible-lint@main
4 changes: 0 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ on: # yamllint disable-line rule:truthy


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
if: github.event_name != 'schedule'
Expand All @@ -32,7 +30,6 @@ jobs:
all_green:
if: ${{ always() && (github.event_name != 'schedule') }}
needs:
- ansible-lint
- changelog
- sanity
- unit-galaxy
Expand All @@ -42,7 +39,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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This collection has been tested against Cisco IOS XE Version 17.3 on CML.
<!--start requires_ansible-->
## Ansible version compatibility

This collection has been tested against following Ansible versions: **>=2.9.10**.
This collection has been tested against following Ansible versions: **>=2.13.11**.

For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
fully qualified collection name (for example, `cisco.ios.ios`).
Expand Down
3 changes: 3 additions & 0 deletions changelogs/fragments/ios_acls.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
doc_changes:
- "ios_acls - update examples and use YAML output in them for better readibility."
6 changes: 6 additions & 0 deletions changelogs/fragments/ios_acls_fix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
doc_changes:
- "ios_command - Fix formatting of examples."
bugfixes:
- "ios_acls - Fix standard acls rendering."
- "ios_acls - Fix protocol_options rendering corrects processing of overridden/ replaced state."
Loading

0 comments on commit 3114198

Please sign in to comment.