Skip to content

Commit

Permalink
ci: update pre-commit configuration inc. for pre-commit.ci [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#450
  • Loading branch information
myii committed Jun 8, 2022
1 parent 2e2aa10 commit 32518b9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 57 deletions.
10 changes: 0 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
default-centos-7-master-py3: {extends: '.test_instance'}
default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
default-fedora-35-master-py3: {extends: '.test_instance'}
default-fedora-34-master-py3: {extends: '.test_instance'}
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
Expand All @@ -225,7 +224,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
Expand All @@ -246,14 +244,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
14 changes: 13 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
---
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
ci:
autofix_commit_msg: |
ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
For more information, see https://pre-commit.ci
autofix_prs: true
autoupdate_branch: ''
autoupdate_commit_msg: |
ci(pre-commit.ci): perform `pre-commit` autoupdate
autoupdate_schedule: quarterly
skip: []
submodules: false
default_stages: [commit]
repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
Expand All @@ -18,7 +30,7 @@ repos:
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.25.1
rev: v1.30.1
hooks:
- id: rubocop
name: Check Ruby files with rubocop
Expand Down
10 changes: 0 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ jobs:
- env: INSTANCE=default-centos-7-master-py3
- env: INSTANCE=default-fedora-36-master-py3
- env: INSTANCE=default-fedora-35-master-py3
- env: INSTANCE=default-fedora-34-master-py3
- env: INSTANCE=default-opensuse-leap-153-master-py3
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
- env: INSTANCE=default-amazonlinux-2-master-py3
Expand All @@ -138,7 +137,6 @@ jobs:
# - env: INSTANCE=default-centos-7-3004-1-py3
# - env: INSTANCE=default-fedora-36-3004-1-py3
# - env: INSTANCE=default-fedora-35-3004-1-py3
# - env: INSTANCE=default-fedora-34-3004-1-py3
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
Expand All @@ -159,14 +157,6 @@ jobs:
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
# - env: INSTANCE=default-almalinux-8-3003-4-py3
# - env: INSTANCE=default-debian-10-3002-8-py3
# - env: INSTANCE=default-debian-9-3002-8-py3
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
# - env: INSTANCE=default-centos-7-3002-8-py3
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
# <REMOVEME

# Test the conversion of `template-formula` into another formula
Expand Down
36 changes: 0 additions & 36 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ platforms:
- name: fedora-35-master-py3
driver:
image: saltimages/salt-master-py3:fedora-35
- name: fedora-34-master-py3
driver:
image: saltimages/salt-master-py3:fedora-34
- name: opensuse-leap-153-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3
Expand Down Expand Up @@ -185,9 +182,6 @@ platforms:
- name: fedora-35-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:fedora-35
- name: fedora-34-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:fedora-34
- name: amazonlinux-2-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:amazonlinux-2
Expand Down Expand Up @@ -266,36 +260,6 @@ platforms:
driver:
image: saltimages/salt-3003.4-py3:almalinux-8

## SALT `3002.8`
- name: debian-10-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-7-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:centos-7
- name: amazonlinux-2-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:amazonlinux-2
- name: oraclelinux-8-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:oraclelinux-8
- name: oraclelinux-7-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:oraclelinux-7

verifier:
# https://www.inspec.io/
name: inspec
Expand Down

0 comments on commit 32518b9

Please sign in to comment.