Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup tox.ini and GHA #439

Merged
merged 11 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: CI
name: Changelog

concurrency:
group: '${{ github.workflow }} @ ${{ github.sha }}'
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/linters.yml → .github/workflows/linters.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: Linters
concurrency:
group: ${{ github.head_ref }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
pull_request:
types:
- opened
- reopened
- labeled
- unlabeled
- synchronize
branches:
- main
Expand All @@ -20,3 +18,10 @@ on:
jobs:
linters:
uses: ansible-network/github_actions/.github/workflows/tox-linters.yml@main
ansible-lint:
runs-on: ubuntu-latest
steps:
- uses: ansible-network/github_actions/.github/actions/checkout_dependency@main

- name: Run ansible-lint
uses: ansible/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# it has to adhere to Python compatibility and CI testing requirements described in
# https://docs.ansible.com/ansible/latest/community/collection_contributors/collection_requirements.html.

name: CI
name: Sanity tests
on:
# Run CI against all pushes (direct commits, also merged PRs), Pull Requests
push:
Expand Down
20 changes: 0 additions & 20 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,6 @@ commands =
deps = git+https://github.com/ansible-network/collection_prep
commands = collection_prep_add_docs -p .

[testenv:refresh_modules]
deps =
git+https://github.com/ansible-collections/gouttelette
git+https://github.com/ansible-collections/vmware_rest_code_generator
black==19.10b0
click==8.0.2
commands =
gouttelette-refresh-modules --target-dir . --collection vmware_rest {posargs}
gouttelette-refresh-ignore-files --target-dir .
black {toxinidir}/plugins {toxinidir}/tests
echo "now you can update the RETURN block, see https://github.com/ansible-collections/vmware_rest_code_generator#how-to-refresh-the-vmwarevmware_rest-content"
allowlist_externals =
echo

[testenv:build_manual]
deps = -r{toxinidir}/docs-requirements.txt
changedir = {toxinidir}/manual/source
Expand Down Expand Up @@ -104,9 +90,3 @@ ignore = E123,E125,E203,E402,E501,E741,F401,F811,F841,W503
max-line-length = 160
builtins = _
exclude = .git,.tox,tests/unit/compat/

[testenv:refresh-examples]
deps =
git+https://github.com/ansible-collections/gouttelette
commands =
gouttelette-refresh-examples --target-dir {toxinidir}