Skip to content

Commit c8f9dd4

Browse files
myiimyii
committed
ci: update pre-commit configuration inc. for pre-commit.ci [skip ci]
* Automated using myii/ssf-formula#450
1 parent 35b9d54 commit c8f9dd4

File tree

8 files changed

+18
-104
lines changed

8 files changed

+18
-104
lines changed

‎.github/workflows/kitchen.vagrant.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
- default-freebsd-130-3004-0-py3
2020
- default-freebsd-123-3004-0-py3
2121
- default-openbsd-70-3003-3-py3
22-
- default-openbsd-69-3002-6-py3
2322
- default-windows-10-latest-py3
2423
- default-windows-81-latest-py3
2524
steps:

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ rubocop:
154154
# default-centos-7-master-py3: {extends: '.test_instance'}
155155
# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
156156
# default-fedora-35-master-py3: {extends: '.test_instance'}
157-
# default-fedora-34-master-py3: {extends: '.test_instance'}
158157
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
159158
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
160159
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -175,7 +174,6 @@ default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
175174
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
176175
default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
177176
default-fedora-35-3004-1-py3: {extends: '.test_instance'}
178-
default-fedora-34-3004-1-py3: {extends: '.test_instance'}
179177
default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
180178
default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
181179
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
@@ -187,7 +185,7 @@ default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
187185
default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
188186
default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
189187
default-debian-10-3003-4-py3: {extends: '.test_instance'}
190-
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
188+
default-debian-9-3003-4-py3: {extends: '.test_instance'}
191189
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
192190
default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
193191
# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
@@ -196,14 +194,6 @@ default-centos-7-3003-4-py3: {extends: '.test_instance'}
196194
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
197195
default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
198196
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
199-
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
200-
default-debian-9-3002-8-py3: {extends: '.test_instance'}
201-
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
202-
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
203-
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
204-
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
205-
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
206-
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
207197
# yamllint enable rule:line-length
208198

209199
###############################################################################

‎.pre-commit-config.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
---
44
# See https://pre-commit.com for more information
55
# See https://pre-commit.com/hooks.html for more hooks
6+
ci:
7+
autofix_commit_msg: |
8+
ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
9+
10+
For more information, see https://pre-commit.ci
11+
autofix_prs: true
12+
autoupdate_branch: ''
13+
autoupdate_commit_msg: |
14+
ci(pre-commit.ci): perform `pre-commit` autoupdate
15+
autoupdate_schedule: quarterly
16+
skip: []
17+
submodules: false
618
default_stages: [commit]
719
repos:
820
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -18,7 +30,7 @@ repos:
1830
additional_dependencies: ['@commitlint/[email protected]']
1931
always_run: true
2032
- repo: https://github.com/rubocop-hq/rubocop
21-
rev: v1.25.1
33+
rev: v1.30.1
2234
hooks:
2335
- id: rubocop
2436
name: Check Ruby files with rubocop

‎.travis.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ jobs:
106106
# - env: INSTANCE=default-centos-7-master-py3
107107
# - env: INSTANCE=default-fedora-36-master-py3
108108
# - env: INSTANCE=default-fedora-35-master-py3
109-
# - env: INSTANCE=default-fedora-34-master-py3
110109
# - env: INSTANCE=default-opensuse-leap-153-master-py3
111110
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
112111
# - env: INSTANCE=default-amazonlinux-2-master-py3
@@ -127,7 +126,6 @@ jobs:
127126
# - env: INSTANCE=default-centos-7-3004-1-py3
128127
- env: INSTANCE=default-fedora-36-3004-1-py3
129128
- env: INSTANCE=default-fedora-35-3004-1-py3
130-
- env: INSTANCE=default-fedora-34-3004-1-py3
131129
- env: INSTANCE=default-amazonlinux-2-3004-1-py3
132130
- env: INSTANCE=default-oraclelinux-8-3004-1-py3
133131
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
@@ -139,7 +137,7 @@ jobs:
139137
- env: INSTANCE=default-opensuse-leap-153-3004-0-py3
140138
- env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
141139
- env: INSTANCE=default-debian-10-3003-4-py3
142-
# - env: INSTANCE=default-debian-9-3003-4-py3
140+
- env: INSTANCE=default-debian-9-3003-4-py3
143141
# - env: INSTANCE=default-ubuntu-2004-3003-4-py3
144142
- env: INSTANCE=default-ubuntu-1804-3003-4-py3
145143
# - env: INSTANCE=default-centos-stream8-3003-4-py3
@@ -148,14 +146,6 @@ jobs:
148146
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
149147
- env: INSTANCE=default-oraclelinux-7-3003-4-py3
150148
# - env: INSTANCE=default-almalinux-8-3003-4-py3
151-
# - env: INSTANCE=default-debian-10-3002-8-py3
152-
- env: INSTANCE=default-debian-9-3002-8-py3
153-
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
154-
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
155-
# - env: INSTANCE=default-centos-7-3002-8-py3
156-
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
157-
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
158-
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
159149

160150
## Define the release stage that runs `semantic-release`
161151
- stage: 'release'

‎kitchen.vagrant.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@ platforms:
5151
verifier:
5252
inputs:
5353
saltmajorversion: 3003
54-
- name: openbsd-69-3002-6-py3
55-
driver:
56-
box: myii/openbsd-6.9-3002.6-py3
57-
ssh:
58-
shell: /bin/ksh
59-
synced_folders: []
60-
verifier:
61-
inputs:
62-
saltmajorversion: 3002
6354
- name: windows-10-latest-py3
6455
driver:
6556
box: techneg/win10x64-pro-salt

‎kitchen.yml‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,6 @@ platforms:
174174
verifier:
175175
inputs:
176176
saltmajorversion: 3004
177-
- name: fedora-34-master-py3
178-
driver:
179-
image: saltimages/salt-master-py3:fedora-34
180-
verifier:
181-
inputs:
182-
saltmajorversion: 3004
183177
- name: opensuse-leap-153-master-py3
184178
driver:
185179
image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -317,12 +311,6 @@ platforms:
317311
verifier:
318312
inputs:
319313
saltmajorversion: 3004
320-
- name: fedora-34-3004-1-py3
321-
driver:
322-
image: saltimages/salt-3004.1-py3:fedora-34
323-
verifier:
324-
inputs:
325-
saltmajorversion: 3004
326314
- name: amazonlinux-2-3004-1-py3
327315
driver:
328316
image: saltimages/salt-3004.1-py3:amazonlinux-2
@@ -461,60 +449,6 @@ platforms:
461449
inputs:
462450
saltmajorversion: 3003
463451

464-
## SALT `3002.8`
465-
- name: debian-10-3002-8-py3
466-
driver:
467-
image: saltimages/salt-3002.8-py3:debian-10
468-
run_command: /lib/systemd/systemd
469-
verifier:
470-
inputs:
471-
saltmajorversion: 3002
472-
- name: debian-9-3002-8-py3
473-
driver:
474-
image: saltimages/salt-3002.8-py3:debian-9
475-
run_command: /lib/systemd/systemd
476-
verifier:
477-
inputs:
478-
saltmajorversion: 3002
479-
- name: ubuntu-2004-3002-8-py3
480-
driver:
481-
image: saltimages/salt-3002.8-py3:ubuntu-20.04
482-
run_command: /lib/systemd/systemd
483-
verifier:
484-
inputs:
485-
saltmajorversion: 3002
486-
- name: ubuntu-1804-3002-8-py3
487-
driver:
488-
image: saltimages/salt-3002.8-py3:ubuntu-18.04
489-
run_command: /lib/systemd/systemd
490-
verifier:
491-
inputs:
492-
saltmajorversion: 3002
493-
- name: centos-7-3002-8-py3
494-
driver:
495-
image: saltimages/salt-3002.8-py3:centos-7
496-
verifier:
497-
inputs:
498-
saltmajorversion: 3002
499-
- name: amazonlinux-2-3002-8-py3
500-
driver:
501-
image: saltimages/salt-3002.8-py3:amazonlinux-2
502-
verifier:
503-
inputs:
504-
saltmajorversion: 3002
505-
- name: oraclelinux-8-3002-8-py3
506-
driver:
507-
image: saltimages/salt-3002.8-py3:oraclelinux-8
508-
verifier:
509-
inputs:
510-
saltmajorversion: 3002
511-
- name: oraclelinux-7-3002-8-py3
512-
driver:
513-
image: saltimages/salt-3002.8-py3:oraclelinux-7
514-
verifier:
515-
inputs:
516-
saltmajorversion: 3002
517-
518452
verifier:
519453
# https://www.inspec.io/
520454
name: inspec

‎test/integration/default/files/_mapdata/debian-9.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ values:
8888
parallel: true
8989
pin_version: false
9090
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
91-
https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main
92-
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg
91+
https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main
92+
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg
9393
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
9494
py_ver: py3
9595
pyinotify: python-pyinotify
9696
python_dulwich: python-dulwich
9797
python_git: python-git
98-
release: '3002'
98+
release: '3003'
9999
restart_via_at: false
100100
retry_options:
101101
attempts: 5

‎test/salt/pillar/top.sls‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ base:
88
- v3004-py3
99
'G@saltversioninfo:0:3003 and G@pythonversion:0:3':
1010
- v3003-py3
11-
'G@saltversioninfo:0:3002 and G@pythonversion:0:3':
12-
- v3002-py3
1311
...

0 commit comments

Comments
 (0)