Skip to content

Commit a1acf89

Browse files
authored
Move config files in .github/linters (#1733)
* Move config files in .github/linters * Fix updated .cspell file if not at the root * cspell * cspell * Add .pnpm-lock.json in default ignored file Fixes streetsidesoftware/cspell#3322 * [MegaLinter] Apply linters fixes * Fix CSpellLinter * cspell Co-authored-by: nvuillam <[email protected]>
1 parent 75983ab commit a1acf89

File tree

10 files changed

+21
-26
lines changed

10 files changed

+21
-26
lines changed

.cspell.json renamed to .github/linters/.cspell.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@
547547
"errno",
548548
"erroron",
549549
"esac",
550+
"esbenp",
550551
"eslintcache",
551552
"eslintconfig",
552553
"eslintignore",
@@ -559,6 +560,7 @@
559560
"everytime",
560561
"evolutive",
561562
"execfile",
563+
"exiasr",
562564
"exitstatus",
563565
"expandafter",
564566
"expressjs",
@@ -594,6 +596,7 @@
594596
"footnotesize",
595597
"forceall",
596598
"forcerun",
599+
"foxundermoon",
597600
"frenchspacing",
598601
"frontmatter",
599602
"fsevents",
@@ -644,6 +647,7 @@
644647
"hamon",
645648
"hardcode",
646649
"hardis",
650+
"hbenl",
647651
"hclfmt",
648652
"headererr",
649653
"headheight",
@@ -784,6 +788,7 @@
784788
"marknotstale",
785789
"markstale",
786790
"martysweet",
791+
"matangover",
787792
"materialx",
788793
"mathmode",
789794
"maxmem",
@@ -943,6 +948,7 @@
943948
"plusplus",
944949
"pmdconfig",
945950
"pmod",
951+
"pnpm",
946952
"poptabs",
947953
"posix",
948954
"posteriori",
@@ -1027,6 +1033,7 @@
10271033
"repositoryformatversion",
10281034
"reqparse",
10291035
"reqs",
1036+
"retrocompatibility",
10301037
"returncode",
10311038
"returnrules",
10321039
"rexec",
@@ -1187,6 +1194,7 @@
11871194
"thirdparty",
11881195
"tibanna",
11891196
"tikzpicture",
1197+
"timonwong",
11901198
"tipa",
11911199
"tlsv",
11921200
"todov",
@@ -1256,6 +1264,7 @@
12561264
"webpreview",
12571265
"weirdnesses",
12581266
"wemn",
1267+
"wesh",
12591268
"wgood",
12601269
"whitespaces",
12611270
"windir",
File renamed without changes.
File renamed without changes.

.github/linters/.hadolint.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
---
2-
##########################
3-
## Hadolint config file ##
4-
##########################
51
ignored:
6-
- DL4001 # Ignore wget and curl in same file
7-
- DL4006 # ignore pipefail as we dont want to add layers
8-
- DL3018 # We do pin version in pipfile.lock
9-
- DL3013 # We do pin version in pipfile.lock
10-
- DL3003 # Ignore workdir so we dont add layers
11-
# - SC2016 # ignore as its intepreted later
12-
- DL3018
2+
- DL3007
3+
- DL3016
4+
- DL3028
5+
- DL3059
6+
- SC2086
7+
- SC2039
8+
- SC3046
File renamed without changes.
File renamed without changes.
File renamed without changes.

.hadolint.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

mega-linter-runner/generators/mega-linter/templates/.cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
"**/node_modules/**",
44
"**/vscode-extension/**",
55
"**/.git/**",
6+
"**/.pnpm-lock.json",
67
".vscode",
78
"megalinter",
89
"package-lock.json",
910
"report"
1011
],
1112
"language": "en",
1213
"noConfigSearch": true,
13-
"words": [],
14+
"words": ["megalinter", "oxsecurity"],
1415
"version": "0.2"
1516
}

megalinter/linters/CSpellLinter.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def complete_text_reporter_report(self, reporter_self):
3636
"**/node_modules/**",
3737
"**/vscode-extension/**",
3838
"**/.git/**",
39+
"**/.pnpm-lock.json",
3940
".vscode",
4041
"package-lock.json",
4142
DEFAULT_REPORT_FOLDER_NAME,
@@ -55,12 +56,8 @@ def complete_text_reporter_report(self, reporter_self):
5556
)
5657

5758
# Generate updated .cspell.json for manual update
58-
cspell_config_file = (
59-
reporter_self.master.github_workspace
60-
+ os.path.sep
61-
+ reporter_self.master.config_file_name
62-
)
63-
if os.path.isfile(cspell_config_file):
59+
cspell_config_file = self.final_config_file
60+
if cspell_config_file is not None and os.path.isfile(cspell_config_file):
6461
try:
6562
with open(cspell_config_file, "r", encoding="utf-8") as json_file:
6663
data = json.load(json_file)

0 commit comments

Comments
 (0)