From e06a3049444ecf489f5b7296690fd4808160f653 Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Thu, 8 Dec 2022 21:26:58 +0100 Subject: [PATCH 01/10] Revert reversion of our precious code - that happened because I had reverted the accidental merge of OSOE-84-final into dev --- .github/actions/spelling/action.yml | 5 ++- .github/actions/spelling/excludes.txt | 2 + .github/actions/spelling/expect.txt | 56 +++++++++------------------ .github/workflows/spelling.yml | 4 +- Docs/Workflows.md | 6 +-- 5 files changed, 28 insertions(+), 45 deletions(-) diff --git a/.github/actions/spelling/action.yml b/.github/actions/spelling/action.yml index 146032dc9..3c8376cd2 100644 --- a/.github/actions/spelling/action.yml +++ b/.github/actions/spelling/action.yml @@ -19,6 +19,7 @@ inputs: cspell:css/css.txt cspell:csharp/csharp.txt cspell:software-terms/src/software-terms.txt + cspell:node/node.txt cspell:typescript/typescript.txt cspell:rust/rust.txt cspell:npm/npm.txt @@ -29,12 +30,12 @@ inputs: description: Spelling configuration directory required: false type: string - default: .github/actions/check-spelling + default: .github/actions/spelling spell-check-this: description: Repository with default configuration to use, the default from Check Spelling is ''. required: false type: string - default: Lombiq/GitHub-Actions@dev + default: Lombiq/GitHub-Actions@issue/OSOE-84-final runs: using: "composite" diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 05a495940..4e7744582 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -30,3 +30,5 @@ UploadingTestFileDOCX.docx \.ico$ \.nupkg$ \.pdf$ +# For Lombiq.DataTables +UnmanagedNodeModules diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index f558da030..b709412f6 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -1,91 +1,77 @@ +Autoprefix Argb Chro Cloudflare Cms CDNs EACCES +EBUSY +EOL # Embedd is added to allow referencing the EmbeddModuleTargets build target used in Orchard Core before version 1.4. Embedd EULA Egyw GDPR -Hsl IShortcode JIRA MVVM NLog -NONINFRINGEMENT -NPM NVARCHAR +Promisified +Resx RHEL -RSPEC -Reks -Rekt -SFCs SUSE XDG + abcdefghijklmnopqrstuvwxyz +argv +binstubs ble blog btn Bubl -buble certs chainable chartjs +chdir chmod chown -chromedriver cjs +copyfiles cref -crlf csharp ctx cwd ecma -editorconfig emails -enableextensions +errored esm -eur -falsey -favicon fff fixme hsva -https icbin idx iife -iis ipsum -itemprop -json jsoneditor jsoneditoronline -labelledby length'l linebreak linkedin -linq linting +lintrc linux -localhost -lockfile +loglevel lookbehind -markdownlint mcr mixin mkdir msbuild -mscorlib msedgedriver mso -mvc -myapp navbar -ndproj nologo +npmrc npx nuget omnisharp @@ -95,43 +81,37 @@ orchardcore parallelizable pickr plusplus -pnpm popstate postclean -pragma prebuild preheader +promisify publishsettings pwsh readdir search'f -setlocal shortcode sln sourced -sourcemaps -sql sqlcmd sudoing +symlink testid +textlint +thenable thetheme todo tundora ubuntu -uri -urijs userspace utf vuejs vuelidate webapp wiki -wpf wwwroot xsessionrc xxl -yaml -yml Aig Airi BJRQ diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 4dd19afea..c409d9f0f 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -47,7 +47,7 @@ on: description: Repository with default configuration to use, the default from Check Spelling is '' required: false type: string - default: Lombiq/GitHub-Actions@dev + default: Lombiq/GitHub-Actions@issue/OSOE-84-final jobs: check-spelling: @@ -79,7 +79,7 @@ jobs: git commit -m 'stub commit -- includes submodules' - name: Check Spelling - uses: Lombiq/GitHub-Actions/.github/actions/spelling@dev + uses: Lombiq/GitHub-Actions/.github/actions/spelling@issue/OSOE-84-final with: dictionary-source-prefixes: ${{ inputs.dictionary-source-prefixes }} extra-dictionaries: ${{ inputs.extra-dictionaries }} diff --git a/Docs/Workflows.md b/Docs/Workflows.md index fe27cd91e..25c5d0701 100644 --- a/Docs/Workflows.md +++ b/Docs/Workflows.md @@ -60,16 +60,16 @@ jobs: ## Spelling workflow -Checks for spelling mistakes in a repository using the [Check Spelling](https://github.com/marketplace/actions/check-spelling) GitHub Action. There are 3 configuration files for filtering false positives: +Checks for spelling mistakes in a repository using the [Check Spelling](https://github.com/marketplace/actions/check-spelling) GitHub Action. The following configuration files for filtering false positives are used: - _`excludes.txt`_: This file includes file names and extensions to be ignored. - _`expect.txt`_: This file contains plain text words that would be considered a spelling mistake. - _`allow.txt`_: Same function as `expect.txt`. Out of convention this file contains meaningful words, while `expect.txt` everything else. - _`patterns.txt`_: This file contains patterns that would be considered a spelling mistake. -There are more configuration files available, for more information visit the action's [wiki](https://github.com/check-spelling/check-spelling/wiki/Configuration#files). +There are more configuration files available, for more information visit the [Check Spelling wiki](https://github.com/check-spelling/check-spelling/wiki/Configuration#files). -You can provide these files in your own repository, under the path `.github/actions/spelling`. This can't be configured for another path. +You can override these files in your own repository, under `.github/actions/spelling/`. This path can be configured by the `config` property. You can also use already existing configuration files by setting the `spell-check-this` parameter to another existing repository, where the files are found in the above-mentioned path. This parameter is needed even if you want to update our dictionary in a custom branch of project consuming this workflow; changing just the workflow's branch from `dev` to your branch won't take any effect, you can leave it as it is. From 68247f5eb941700ec282310c9cfa104ae29add64 Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Fri, 9 Dec 2022 14:04:54 +0100 Subject: [PATCH 02/10] Shorten the artifact name --- Scripts/Initialize-ArtifactNameSuffix.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/Initialize-ArtifactNameSuffix.ps1 b/Scripts/Initialize-ArtifactNameSuffix.ps1 index 4fe6c9e88..ffba59aef 100644 --- a/Scripts/Initialize-ArtifactNameSuffix.ps1 +++ b/Scripts/Initialize-ArtifactNameSuffix.ps1 @@ -10,7 +10,7 @@ param ( ) $friendlyBuildDirectoryName = $BuildDirectoryPath.Replace('/', '__') -$runnerSuffix = "$Env:RUNNER_OS-$Env:RUNNER_ARCH-$Env:RUNNER_NAME" +$runnerSuffix = "$Env:RUNNER_NAME".Replace(' ', '-') Set-GitHubOutput 'friendly-build-directory-name' $friendlyBuildDirectoryName Set-GitHubOutput 'runner-suffix' $runnerSuffix From b8903ccb4a4f49e9b0d156f128e109b4717d6285 Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Tue, 13 Dec 2022 00:35:29 +0100 Subject: [PATCH 03/10] Add iis and localhost to allow.txt --- .github/actions/spelling/allow.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index 6e41d6ef5..35792c05a 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -83,6 +83,7 @@ glyphicon hashable hca hostnames +iis inheritdoc isignal issetuprecipe @@ -93,6 +94,7 @@ jsonparse langword linq listheader +localhost logtest misconfigured multiselect From 7b163e16d0d5617e623f8af0da862b41447cea3d Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Wed, 28 Dec 2022 01:54:34 +0100 Subject: [PATCH 04/10] Allowing more words for NE --- .github/actions/spelling/allow.txt | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index e2ac53c2f..26581925d 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -7,17 +7,21 @@ apiclienttenant apikey apps appsettings +argv ASPNETCORE asynchronicity atata autocompletion +Autoprefix autorun bacpac basethemesample beforeunload +binstubs bootstraptab browsersync Cdp +chdir chromedriver cloudsmith cmdlet @@ -35,6 +39,7 @@ Configurator contentfiles contentitemid contextmenu +copyfiles corepack createstate crontab @@ -55,18 +60,21 @@ dotnestcore dotnet dragleave dragover +EBUSY endcapture endgroup endzone Enums +EOL +errored eventname executesql extname facebook Firefox flyout -formattable Formattable +formattable frontend geckodriver Giraudel @@ -251,8 +259,10 @@ JToken JValue langword linq +lintrc listheader localhost +loglevel logtest lombiq Lucene @@ -270,16 +280,20 @@ mvc Namespaced NCrontab Newtonsoft +npmrc paramref permalink plugin plugins Portainer prebuilt +Promisified +promisify readme Reappend refactoring RESTful +Resx retriable rnwood rolename @@ -308,6 +322,7 @@ subfolders submenu Subresource superproject +symlink taghelper TAttribute taxonomyexpensetags @@ -328,8 +343,10 @@ teamcity TElement TEntry testuser +textlint TField TGenerator +thenable timespan Timestamped Timezones From 1f4ad7faee803f450904b958f5211fa2917b1496 Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Fri, 13 Jan 2023 11:10:54 +0100 Subject: [PATCH 05/10] Add symlinks and symlinked to dictionary --- .github/actions/spelling/allow.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index e98bf35a5..bd61bee12 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -187,6 +187,8 @@ submenu Subresource superproject symlink +symlinks +symlinked taghelper taxonomyexpensetags taxonomyfield From 2ff8ddb16df62a3b5d6ab072a89a1fd3b6e8de43 Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Wed, 18 Jan 2023 14:26:07 +0100 Subject: [PATCH 06/10] Temporarily removing new entries to see where they are used --- .github/actions/spelling/allow.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index 9d5999212..035d33486 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -8,21 +8,17 @@ apiclienttenant apikey apps appsettings -argv ASPNETCORE asynchronicity atata autocompletion -Autoprefix autorun bacpac basethemesample beforeunload -binstubs bootstraptab browsersync Cdp -chdir chromedriver cloudsmith cmdlet @@ -41,7 +37,6 @@ contentitem contentitemid contenttype contextmenu -copyfiles corepack createstate crontab @@ -63,13 +58,10 @@ dotnet dragleave dragover eastus -EBUSY endcapture endgroup endzone Enums -EOL -errored EUS eventname executesql @@ -98,7 +90,6 @@ hostnames hotfix hotfixes htmlvalidate -iis Inbox inheritdoc Intelli @@ -120,10 +111,7 @@ JToken JValue langword linq -lintrc listheader -localhost -loglevel logtest lombiq lucene @@ -141,20 +129,16 @@ mvc Namespaced NCrontab Newtonsoft -npmrc paramref permalink plugin plugins Portainer prebuilt -Promisified -promisify readme Reappend refactoring RESTful -Resx retriable rnwood rolename @@ -184,17 +168,12 @@ subfolders submenu Subresource superproject -symlink -symlinks -symlinked taghelper taxonomyexpensetags taxonomyfield taxonomyincometags teamcity testuser -textlint -thenable timespan Timestamped Timezones From 9495209b0f661ffa3e387164899618220ab92594 Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Wed, 18 Jan 2023 15:27:12 +0100 Subject: [PATCH 07/10] Re-add necessary new entries --- .github/actions/spelling/allow.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index 035d33486..2f0d0f51c 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -8,6 +8,7 @@ apiclienttenant apikey apps appsettings +argv ASPNETCORE asynchronicity atata @@ -19,6 +20,7 @@ beforeunload bootstraptab browsersync Cdp +chdir chromedriver cloudsmith cmdlet @@ -37,6 +39,7 @@ contentitem contentitemid contenttype contextmenu +copyfiles corepack createstate crontab @@ -62,6 +65,7 @@ endcapture endgroup endzone Enums +EOL EUS eventname executesql @@ -111,7 +115,9 @@ JToken JValue langword linq +lintrc listheader +loglevel logtest lombiq lucene @@ -129,12 +135,14 @@ mvc Namespaced NCrontab Newtonsoft +npmrc paramref permalink plugin plugins Portainer prebuilt +promisify readme Reappend refactoring @@ -168,12 +176,16 @@ subfolders submenu Subresource superproject +symlink +symlinks +symlinked taghelper taxonomyexpensetags taxonomyfield taxonomyincometags teamcity testuser +textlint timespan Timestamped Timezones From 32cc827997cf3a38550b6b75a9afd409ce38cf0c Mon Sep 17 00:00:00 2001 From: Oliver Friedrich Date: Wed, 18 Jan 2023 21:38:03 +0100 Subject: [PATCH 08/10] Revert "Shorten the artifact name" This reverts commit 68247f5eb941700ec282310c9cfa104ae29add64. --- Scripts/Initialize-ArtifactNameSuffix.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/Initialize-ArtifactNameSuffix.ps1 b/Scripts/Initialize-ArtifactNameSuffix.ps1 index ffba59aef..4fe6c9e88 100644 --- a/Scripts/Initialize-ArtifactNameSuffix.ps1 +++ b/Scripts/Initialize-ArtifactNameSuffix.ps1 @@ -10,7 +10,7 @@ param ( ) $friendlyBuildDirectoryName = $BuildDirectoryPath.Replace('/', '__') -$runnerSuffix = "$Env:RUNNER_NAME".Replace(' ', '-') +$runnerSuffix = "$Env:RUNNER_OS-$Env:RUNNER_ARCH-$Env:RUNNER_NAME" Set-GitHubOutput 'friendly-build-directory-name' $friendlyBuildDirectoryName Set-GitHubOutput 'runner-suffix' $runnerSuffix From 87277a1f353f8636d0c9f3726cc45a51917c2bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= Date: Tue, 24 Jan 2023 02:01:01 +0100 Subject: [PATCH 09/10] revert branch selector --- .github/actions/spelling/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/spelling/action.yml b/.github/actions/spelling/action.yml index 83e50e839..e8b05d5e0 100644 --- a/.github/actions/spelling/action.yml +++ b/.github/actions/spelling/action.yml @@ -39,7 +39,7 @@ inputs: spell-check-this: description: Repository with default configuration to use, the default from Check Spelling is ''. required: false - default: Lombiq/GitHub-Actions@issue/OSOE-84-final + default: Lombiq/GitHub-Actions@dev runs: using: "composite" From 1e2d0657d51669b915e4df5a718fe9ec4848609d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= Date: Tue, 24 Jan 2023 02:01:27 +0100 Subject: [PATCH 10/10] revert branch selector --- .github/workflows/spelling.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 5fada8f9c..931def3a8 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -49,7 +49,7 @@ on: description: Repository with default configuration to use, the default from Check Spelling is '' required: false type: string - default: Lombiq/GitHub-Actions@issue/OSOE-84-final + default: Lombiq/GitHub-Actions@dev jobs: check-spelling: @@ -73,7 +73,7 @@ jobs: git commit -m 'stub commit -- includes submodules' - name: Check Spelling - uses: Lombiq/GitHub-Actions/.github/actions/spelling@issue/OSOE-84-final + uses: Lombiq/GitHub-Actions/.github/actions/spelling@dev with: dictionary-source-prefixes: ${{ inputs.dictionary-source-prefixes }} extra-dictionaries: ${{ inputs.extra-dictionaries }}