Skip to content

Commit 8483b45

Browse files
committed
Merge remote-tracking branch 'apache/main' into feature-ui-logs
2 parents d4b9d57 + 5798fb4 commit 8483b45

File tree

131 files changed

+1242
-764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1242
-764
lines changed

.github/linters/codespell.txt

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ acount
44
actuall
55
acuiring
66
acumulate
7+
addin
78
addreess
89
addtion
910
adminstrator
@@ -12,10 +13,8 @@ afrer
1213
afterall
1314
againt
1415
ags
15-
aktive
1616
algoritm
1717
allo
18-
alloacate
1918
allocted
2019
alocation
2120
alogrithm
@@ -65,6 +64,7 @@ bject
6564
boardcast
6665
bootstraper
6766
bu
67+
callin
6868
cant
6969
capabilites
7070
capablity
@@ -73,6 +73,7 @@ carrefully
7373
cavaet
7474
chaing
7575
checkd
76+
checkin
7677
childs
7778
choosen
7879
chould
@@ -93,17 +94,14 @@ confg
9394
configruation
9495
configuable
9596
conneciton
96-
connexion
9797
constrait
9898
constraits
9999
containg
100100
contex
101101
continuesly
102102
contro
103103
controler
104-
controles
105104
controll
106-
convienient
107105
convinience
108106
coputer
109107
correcponding
@@ -158,13 +156,13 @@ differnet
158156
differnt
159157
direcotry
160158
directroy
161-
disale
162159
disbale
163160
discrepency
164161
disover
165162
dissapper
166163
dissassociated
167164
divice
165+
dockin
168166
doesn'
169167
doesnot
170168
doesnt
@@ -175,7 +173,6 @@ eanbled
175173
earch
176174
ect
177175
elemnt
178-
eles
179176
elments
180177
emmited
181178
enble
@@ -187,22 +184,19 @@ environmnet
187184
equivalant
188185
erro
189186
erronous
190-
everthing
191187
everytime
192188
excute
193189
execept
194190
execption
191+
exects
195192
execut
196193
executeable
197194
exeeded
198195
exisitng
199196
exisits
200-
existin
201197
existsing
202-
exitting
203198
expcted
204199
expection
205-
explaination
206200
explicitely
207201
faield
208202
faild
@@ -215,7 +209,6 @@ fillled
215209
findout
216210
fisrt
217211
fo
218-
folowing
219212
fowarding
220213
frist
221214
fro
@@ -234,6 +227,7 @@ hanling
234227
happend
235228
hasing
236229
hasnt
230+
havin
237231
hda
238232
hostanme
239233
hould
@@ -253,18 +247,13 @@ implmeneted
253247
implmentation
254248
incase
255249
includeing
256-
incosistency
257250
indecates
258-
indien
259251
infor
260252
informations
261253
informaton
262-
infrastrcuture
263254
ingore
264-
inital
265255
initalize
266256
initator
267-
initilization
268257
inspite
269258
instace
270259
instal
@@ -284,12 +273,8 @@ ist
284273
klunky
285274
lable
286275
leve
287-
lief
288276
limite
289-
linke
290277
listner
291-
lokal
292-
lokales
293278
maintainence
294279
maintenace
295280
maintenence
@@ -298,7 +283,6 @@ mambers
298283
manaully
299284
manuel
300285
maxium
301-
mehtod
302286
mergable
303287
mesage
304288
messge
@@ -308,7 +292,6 @@ minumum
308292
mis
309293
modifers
310294
mor
311-
mot
312295
mulitply
313296
multipl
314297
multple
@@ -322,7 +305,7 @@ nin
322305
nodel
323306
nome
324307
noone
325-
nowe
308+
notin
326309
numbe
327310
numer
328311
occured
@@ -390,11 +373,9 @@ remaning
390373
remore
391374
remvoing
392375
renabling
393-
repeatly
394376
reponse
395377
reqest
396378
reqiured
397-
requieres
398379
requried
399380
reserv
400381
reserverd
@@ -414,14 +395,13 @@ retuned
414395
returing
415396
rever
416397
rocessor
398+
roperty
417399
runing
418400
runnign
419401
sate
420402
scalled
421-
scipt
422403
scirpt
423404
scrip
424-
seconadry
425405
seconday
426406
seesion
427407
sepcified
@@ -434,12 +414,10 @@ settig
434414
sevices
435415
shoul
436416
shoule
437-
sie
438417
signle
439418
simplier
440419
singature
441420
skiping
442-
snaphsot
443421
snpashot
444422
specied
445423
specifed
@@ -450,7 +428,6 @@ standy
450428
statics
451429
stickyness
452430
stil
453-
stip
454431
storeage
455432
strat
456433
streched
@@ -459,7 +436,6 @@ succesfull
459436
successfull
460437
suceessful
461438
suces
462-
sucessfully
463439
suiteable
464440
suppots
465441
suppport
@@ -492,22 +468,19 @@ uncompressible
492468
uneccessarily
493469
unexepected
494470
unexpect
495-
unknow
496471
unkonw
497472
unkown
498473
unneccessary
499474
unparseable
500475
unrecoginized
501476
unsupport
502477
unxpected
503-
updat
504478
uptodate
505479
usera
506480
usign
507481
usin
508482
utlization
509483
vaidate
510-
valiate
511484
valule
512485
valus
513486
varibles
@@ -516,8 +489,6 @@ verfying
516489
verifing
517490
virutal
518491
visable
519-
wakup
520492
wil
521493
wit
522-
wll
523494
wth

.github/workflows/linter.yml renamed to .github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444
path: ~/.cache/pre-commit
4545
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
4646
- name: Run pre-commit
47-
run: pre-commit run --all-files
47+
run: pre-commit run --color=always --all-files
4848
- name: Run manual pre-commit hooks
49-
run: pre-commit run --all-files --hook-stage manual
49+
run: pre-commit run --color=always --all-files --hook-stage manual

.pre-commit-config.yaml

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ repos:
2525
hooks:
2626
- id: identity
2727
- id: check-hooks-apply
28+
- repo: https://github.com/thlorenz/doctoc.git
29+
rev: v2.2.0
30+
hooks:
31+
- id: doctoc
32+
name: Add TOC for Markdown files
33+
files: ^CONTRIBUTING\.md$|^INSTALL\.md$|^README\.md$
2834
- repo: https://github.com/oxipng/oxipng
2935
rev: v9.1.5
3036
hooks:
@@ -41,6 +47,11 @@ repos:
4147
- repo: https://github.com/Lucas-C/pre-commit-hooks
4248
rev: v1.5.5
4349
hooks:
50+
- id: chmod
51+
name: set file permissions
52+
args: ['644']
53+
files: \.md$
54+
stages: [manual]
4455
- id: insert-license
4556
name: add license for all Markdown files
4657
files: \.md$
@@ -51,6 +62,35 @@ repos:
5162
- .github/workflows/license-templates/LICENSE.txt
5263
- --fuzzy-match-generates-todo
5364
exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
65+
- id: insert-license
66+
name: add license for all Shell files
67+
description: automatically adds a licence header to all Shell files that don't have a license header
68+
files: \.sh$
69+
args:
70+
- --comment-style
71+
- '|#|'
72+
- --license-filepath
73+
- .github/workflows/license-templates/LICENSE.txt
74+
- --fuzzy-match-generates-todo
75+
- id: insert-license
76+
name: add license for all SQL files
77+
files: \.sql$
78+
args:
79+
- --comment-style
80+
- '|--|'
81+
- --license-filepath
82+
- .github/workflows/license-templates/LICENSE.txt
83+
- --fuzzy-match-generates-todo
84+
- id: insert-license
85+
name: add license for all YAML files
86+
description: automatically adds a licence header to all YAML files that don't have a license header
87+
files: \.ya?ml$
88+
args:
89+
- --comment-style
90+
- '|#|'
91+
- --license-filepath
92+
- .github/workflows/license-templates/LICENSE.txt
93+
- --fuzzy-match-generates-todo
5494
- repo: https://github.com/pre-commit/pre-commit-hooks
5595
rev: v6.0.0
5696
hooks:
@@ -96,7 +136,7 @@ repos:
96136
args: [--markdown-linebreak-ext=md]
97137
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
98138
- repo: https://github.com/codespell-project/codespell
99-
rev: v2.2.6
139+
rev: v2.4.1
100140
hooks:
101141
- id: codespell
102142
name: run codespell
@@ -117,14 +157,6 @@ repos:
117157
args: [--config=.github/linters/.markdown-lint.yml]
118158
types: [markdown]
119159
files: \.(md|mdown|markdown)$
120-
- repo: https://github.com/Lucas-C/pre-commit-hooks
121-
rev: v1.5.5
122-
hooks:
123-
- id: chmod
124-
name: set file permissions
125-
args: ['644']
126-
files: \.md$
127-
stages: [manual]
128160
- repo: https://github.com/adrienverge/yamllint
129161
rev: v1.37.1
130162
hooks:

CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,24 @@
2121

2222
## Summary
2323

24+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
25+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
26+
27+
- [Summary](#summary)
28+
- [Bug fixes](#bug-fixes)
29+
- [Developing new features](#developing-new-features)
30+
- [PendingReleaseNotes file](#pendingreleasenotes-file)
31+
- [Fork the code](#fork-the-code)
32+
- [Making changes](#making-changes)
33+
- [Rebase `feature_x` to include updates from `upstream/main`](#rebase-feature_x-to-include-updates-from-upstreammain)
34+
- [Make a GitHub Pull Request to contribute your changes](#make-a-github-pull-request-to-contribute-your-changes)
35+
- [Cleaning up after a successful pull request](#cleaning-up-after-a-successful-pull-request)
36+
- [Release Principles](#release-principles)
37+
38+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
39+
40+
## Summary
41+
2442
This document covers how to contribute to the ACS project. ACS uses GitHub PRs to manage code contributions.
2543
These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project, and you will submit a Pull Request for your changes to be added.
2644

0 commit comments

Comments
 (0)