Skip to content

Commit 6057ca7

Browse files
authored
Merge pull request #277 from jeff350/fixing_CI
chore: update precommit
2 parents 3c0568c + 5f487e3 commit 6057ca7

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ rubocop:
146146
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
147147
default-debian-11-master-py3: {extends: '.test_instance'}
148148
default-debian-10-master-py3: {extends: '.test_instance'}
149-
default-debian-9-master-py3: {extends: '.test_instance'}
150149
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
151150
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
152151
default-ubuntu-1804-master-py3: {extends: '.test_instance'}

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@ repos:
3030
additional_dependencies: ['@commitlint/[email protected]']
3131
always_run: true
3232
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.30.1
33+
rev: v1.56.4
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
3737
args: [--debug]
3838
always_run: true
3939
pass_filenames: false
4040
- repo: https://github.com/shellcheck-py/shellcheck-py
41-
rev: v0.8.0.4
41+
rev: v0.9.0.6
4242
hooks:
4343
- id: shellcheck
4444
name: Check shell scripts with shellcheck
4545
files: ^.*\.(sh|bash|ksh)$
4646
types: []
4747
- repo: https://github.com/adrienverge/yamllint
48-
rev: v1.26.3
48+
rev: v1.32.0
4949
hooks:
5050
- id: yamllint
5151
name: Check YAML syntax with yamllint
5252
args: [--strict, '.']
5353
always_run: true
5454
pass_filenames: false
5555
- repo: https://github.com/warpnet/salt-lint
56-
rev: v0.8.0
56+
rev: v0.9.2
5757
hooks:
5858
- id: salt-lint
5959
name: Check Salt files using salt-lint

mysql/config.sls

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mysql_server_config:
2020
- source: salt://{{ tpldir }}/files/server.cnf
2121
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
2222
- context:
23-
tpldir: {{ tpldir }}
23+
tpldir: {{ tpldir }}
2424
- user: root
2525
- group: root
2626
- mode: 644
@@ -37,7 +37,7 @@ mysql_galera_config:
3737
- source: salt://{{ tpldir }}/files/galera.cnf
3838
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
3939
- context:
40-
tpldir: {{ tpldir }}
40+
tpldir: {{ tpldir }}
4141
- user: root
4242
- group: root
4343
- mode: 644
@@ -54,7 +54,7 @@ mysql_library_config:
5454
- source: salt://{{ tpldir }}/files/client.cnf
5555
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
5656
- context:
57-
tpldir: {{ tpldir }}
57+
tpldir: {{ tpldir }}
5858
- user: root
5959
- group: root
6060
- mode: 644
@@ -71,7 +71,7 @@ mysql_clients_config:
7171
- source: salt://{{ tpldir }}/files/mysql-clients.cnf
7272
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
7373
- context:
74-
tpldir: {{ tpldir }}
74+
tpldir: {{ tpldir }}
7575
- user: root
7676
- group: root
7777
- mode: 644
@@ -92,7 +92,7 @@ mysql_config:
9292
- source: salt://{{ tpldir }}/files/my.cnf
9393
{%- endif %}
9494
- context:
95-
tpldir: {{ tpldir }}
95+
tpldir: {{ tpldir }}
9696
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
9797
- user: root
9898
- group: root

mysql/macos/install.sls

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ mysql-macos-{{ product }}-desktop-shortcut-add:
8181
- mode: 755
8282
- template: jinja
8383
- context:
84-
user: {{ mysql.macos.user }}
85-
home: {{ mysql.macos.userhomes }}
86-
app: {{ data.app }}
87-
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
88-
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
84+
user: {{ mysql.macos.user }}
85+
home: {{ mysql.macos.userhomes }}
86+
app: {{ data.app }}
87+
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
88+
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
8989
cmd.run:
9090
- name: /tmp/mac_shortcut.sh add
9191
- runas: {{ mysql.macos.user }}

mysql/macos/remove.sls

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ mysql-macos-{{ product }}-desktop-shortcut-remove:
1919
- mode: 755
2020
- template: jinja
2121
- context:
22-
user: {{ mysql.macos.user }}
23-
home: {{ mysql.macos.userhomes }}
24-
app: {{ data.app }}
25-
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
26-
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
22+
user: {{ mysql.macos.user }}
23+
home: {{ mysql.macos.userhomes }}
24+
app: {{ data.app }}
25+
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
26+
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
2727
cmd.run:
2828
- name: /tmp/mac_shortcut.sh remove
2929
- runas: {{ mysql.macos.user }}

0 commit comments

Comments
 (0)