Skip to content

Commit

Permalink
Fix pre-commit and update CI (netbox-community#875)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewimeson authored Aug 11, 2022
1 parent 551b097 commit 66c7560
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# close-stale-issues (https://github.com/marketplace/actions/close-stale-issues)
name: Close stale PRs
on:
on: # yamllint disable-line rule:truthy
schedule:
- cron: 0 4 * * *

Expand All @@ -19,6 +19,6 @@ jobs:
remove-stale-when-updated: false
stale-pr-label: stale
stale-pr-message: >
This PR has been automatically marked as stale because it has not had
recent activity. It will be closed automatically if no further progress
is made.
This PR has been automatically marked as stale because it has not
had recent activity. It will be closed automatically if no further
progress is made.
17 changes: 11 additions & 6 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
---
name: Validate definitions

on:

on: # yamllint disable-line rule:truthy
pull_request:
branches:
- master

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
python-version: 3.8

- name: Install dependencies
run: pip install -r requirements.txt

- name: Lint YAML files
run: yamllint --format parsable --strict -c=tests/yamllint.yaml device-types/ module-types/
run: |
yamllint --format github --strict \
device-types/ module-types/
- name: Run tests
run: pytest --tb=short -v
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.3.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
name: Check YAML files
- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
rev: 0.1.0
rev: 0.2.2
hooks:
- id: yamlfmt
args: [--mapping, '2', --sequence, '4', --offset, '2']
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.26.0
rev: v1.27.1
hooks:
- id: yamllint
name: Lint YAML files
args: [--format, parsable, --strict, -c=tests/yamllint.yaml]
args: [--format, parsable, --strict]
3 changes: 0 additions & 3 deletions tests/yamllint.yaml → .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,3 @@ rules:
octal-values: disable
quoted-strings: disable
trailing-spaces: enable
truthy:
ignore: |
.github/workflows/validation.yml
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonschema==3.2.0
pytest==5.3.2
PyYAML==5.4
yamllint==1.26.0
yamllint==1.27.1

0 comments on commit 66c7560

Please sign in to comment.