From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 13 Jul 2021 07:30:54 +0000 (-0400)
Subject: Upgrade check-spelling to v0.0.19
X-Git-Tag: dnsdist-1.7.0-alpha1~90^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10588%2Fhead;p=thirdparty%2Fpdns.git

Upgrade check-spelling to v0.0.19

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
---

diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt
index 00192b5119..54d92a7cdb 100644
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -1,10 +1,15 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
 # want to include regression-tests.*/description
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
 (?:^|/)ext/
 (?:^|/)go\.mod$
 (?:^|/)go\.sum$
 (?:^|/)m4/
+(?:^|/)package(?:-lock|)\.json$
 (?:^|/)package-lock\.json$
 (?:^|/)requirements\.txt$
+(?:^|/)vendor/
 /expected_result
 /test-base64_cc\.cc$
 /test-dnsrecords_cc\.cc$
@@ -12,6 +17,7 @@ ignore$
 SUMS$
 \.ai$
 \.asc$
+\.avi$
 \.bmp$
 \.cer$
 \.class$
@@ -37,8 +43,10 @@ SUMS$
 \.map$
 \.min\..
 \.mmdb$
+\.mod$
 \.mp3$
 \.mp4$
+\.mp[34]$
 \.nsec3(?:-optout|)$
 \.otf$
 \.pdf$
@@ -53,6 +61,7 @@ SUMS$
 \.tar$
 \.tgz$
 \.ttf$
+\.wav$
 \.woff
 \.xcf$
 \.xls
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 39a4a0388f..4d303f41b6 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
->>>>>>> c1c09a002 (Upgrade check-spelling to v0.0.18)
 aaaarecord
 aae
 aaldering
@@ -126,7 +124,6 @@ basedn
 basepath
 Bastiaan
 bayour
-bbbb
 bbc
 bbd
 bdd
@@ -1285,6 +1282,7 @@ progid
 protobuf
 protozero
 providername
+proxyprotocol
 proxyprotocolvalues
 pseudonymize
 pseudorecord
diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt
index 17b6eb61cf..ec4e8af463 100644
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -1,3 +1,5 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
 # GitHub SHAs
 \bapi.github\.com/repos/[^/]+/[^/]+/[^/]+/[0-9a-f]+\b
 (?:\[[0-9a-f]+\]\(https:/|)/github\.com/[^/]+/[^/]+/[^/]+/[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b
@@ -23,7 +25,10 @@ msdn\.microsoft\.com/(?:[^/]+/|)library/\S*\.aspx?
 addNSECRecordToLW.*DNSName.*powerdnt.com.*QType::NS.*res->d_records
 data:[a-zA-Z=;,/0-9+]+
 BOOST_CHECK_EQUAL\(b64, "[a-zA-Z=;,/0-9+]+"
-\b([A-Za-z])\1{3,}\b
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
+
 C(?:XX|)FLAGS="[^"]*"
 
 nsec3param\s*=\s*'[^']*'
diff --git a/.github/actions/spell-check/reject.txt b/.github/actions/spell-check/reject.txt
new file mode 100644
index 0000000000..a5ba6f6390
--- /dev/null
+++ b/.github/actions/spell-check/reject.txt
@@ -0,0 +1,7 @@
+^attache$
+benefitting
+occurence
+Sorce
+^[Ss]pae
+^untill
+^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling2.yml
similarity index 57%
rename from .github/workflows/spelling.yml
rename to .github/workflows/spelling2.yml
index b1db41bf52..e24b9dfd1b 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling2.yml
@@ -1,3 +1,4 @@
+# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
 name: Spell checking
 on:
   push:
@@ -18,13 +19,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout-merge
-      if: false
-      uses: actions/checkout@v2.0.0
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
       with:
         ref: refs/pull/${{github.event.pull_request.number}}/merge
     - name: checkout
-      if: false
-      uses: actions/checkout@v2.0.0
-    - uses: check-spelling/check-spelling@v0.0.18
+      if: ${{ github.event_name == 'push' }}
+      uses: actions/checkout@v2
+    - uses: check-spelling/check-spelling@v0.0.19
+      id: spelling
       with:
         config: .github/actions/spell-check