From 58f7be0873891791cfe79db03a49953cec44e0a6 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:19:57 +0800 Subject: [PATCH 01/18] Tweak file exclusion rule --- .github/actions/spelling/excludes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index e1d95e7738d..f90d4fa9977 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -59,9 +59,9 @@ # Custom (?:^|/)Languages/(?!en.xaml) Scripts/ -Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/ -Plugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json -Plugins/Flow.Launcher.Plugin.WebSearch/setting.json +Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/(?!Resources.resx) +\QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E +\QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E (?:^|/)FodyWeavers.xml .editorconfig ignore$ From fec3b695f5b9c2921b9b302d44a0cf97aa9bada5 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:42:36 +0800 Subject: [PATCH 02/18] Exclude l10n_dev branch --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 7a7a48bcdd5..32ff3aaaaa6 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -65,7 +65,7 @@ jobs: outputs: followup: ${{ steps.spelling.outputs.followup }} runs-on: ubuntu-latest - if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'" + if: contains(github.event_name, 'pull_request') && github.ref != 'ref/heads/l10n_dev' || github.event_name == 'push' concurrency: group: spelling-${{ github.event.pull_request.number || github.ref }} # note: If you use only_check_changed_files, you do not want cancel-in-progress From 3fd9872f091cf15004b739e09cf65bb5039a5249 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:43:01 +0800 Subject: [PATCH 03/18] Disable cancel in progress --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 32ff3aaaaa6..555ec4a61e7 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -69,7 +69,7 @@ jobs: concurrency: group: spelling-${{ github.event.pull_request.number || github.ref }} # note: If you use only_check_changed_files, you do not want cancel-in-progress - cancel-in-progress: true + cancel-in-progress: false steps: - name: check-spelling id: spelling From f4dcb29eb706dc7492b55f42c4cd39c13de77e5c Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:43:28 +0800 Subject: [PATCH 04/18] Temporarily check all for test --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 555ec4a61e7..0d9f772a4fb 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -85,7 +85,7 @@ jobs: use_sarif: 0 # to show in pr page extra_dictionary_limit: 10 check_commit_messages: commits title description - only_check_changed_files: 1 + only_check_changed_files: 0 check_extra_dictionaries: '' quit_without_error: true extra_dictionaries: From 1be5ec2b94764777dd751f174758da03142f4445 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:09:19 +0800 Subject: [PATCH 05/18] Fix checking head ref --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 0d9f772a4fb..7894462314e 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -65,7 +65,7 @@ jobs: outputs: followup: ${{ steps.spelling.outputs.followup }} runs-on: ubuntu-latest - if: contains(github.event_name, 'pull_request') && github.ref != 'ref/heads/l10n_dev' || github.event_name == 'push' + if: contains(github.event_name, 'pull_request') && github.head_ref != 'ref/heads/l10n_dev' || github.event_name == 'push' concurrency: group: spelling-${{ github.event.pull_request.number || github.ref }} # note: If you use only_check_changed_files, you do not want cancel-in-progress From 3d7762b45505ca1a952e44539724101b69ce2824 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:12:44 +0800 Subject: [PATCH 06/18] Stop checking Resources.resx --- .github/actions/spelling/excludes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index f90d4fa9977..8591f49dd62 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -59,7 +59,7 @@ # Custom (?:^|/)Languages/(?!en.xaml) Scripts/ -Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/(?!Resources.resx) +Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/ \QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E \QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E (?:^|/)FodyWeavers.xml From 87cebbf2b895bc72635e15c9f2c72f73f02c5542 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:15:25 +0800 Subject: [PATCH 07/18] Update texts --- .github/actions/spelling/expect.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 51bcf83f5d4..b62b858c5ad 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -57,4 +57,7 @@ runas dpi popup ptr -pluginindicator \ No newline at end of file +pluginindicator +TobiasSekan +Img +img \ No newline at end of file From 1f5f15cbd89d01a48f48994440950e6d5ff83e3a Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:21:38 +0800 Subject: [PATCH 08/18] Update regex --- .github/actions/spelling/patterns.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index c0a00815304..2f4ff418da0 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -111,6 +111,7 @@ # html tag <\w+[^>]*> +]*> #http/https (?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|] From 483371e1ed723e70e5fdbda054a12746b6147788 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:39:08 +0800 Subject: [PATCH 09/18] update exclude list --- .github/actions/spelling/excludes.txt | 5 +++-- .github/actions/spelling/expect.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 8591f49dd62..1b5abce0c07 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -60,8 +60,9 @@ (?:^|/)Languages/(?!en.xaml) Scripts/ Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/ -\QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E -\QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E +Flow.Launcher/Properties/ +^\QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E$ +^\QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E$ (?:^|/)FodyWeavers.xml .editorconfig ignore$ diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index b62b858c5ad..77a33eafb1f 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -60,4 +60,4 @@ ptr pluginindicator TobiasSekan Img -img \ No newline at end of file +img From 1c1602f9f2a95454f68eec9161d9ed2daad2ffce Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:46:16 +0800 Subject: [PATCH 10/18] Test l10n_dev --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 7894462314e..fbd25193f7e 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -85,7 +85,7 @@ jobs: use_sarif: 0 # to show in pr page extra_dictionary_limit: 10 check_commit_messages: commits title description - only_check_changed_files: 0 + only_check_changed_files: 1 check_extra_dictionaries: '' quit_without_error: true extra_dictionaries: From 9e05cc8970d3a4d1d8ef288a7b1849043e8cfaab Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:52:31 +0800 Subject: [PATCH 11/18] ignore resx --- .github/actions/spelling/excludes.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 1b5abce0c07..ecf231f8850 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -59,8 +59,7 @@ # Custom (?:^|/)Languages/(?!en.xaml) Scripts/ -Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/ -Flow.Launcher/Properties/ +\.resx$ ^\QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E$ ^\QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E$ (?:^|/)FodyWeavers.xml From 80b867f088b33233c505cdc379a8c92a19c03c9c Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:56:25 +0800 Subject: [PATCH 12/18] update --- .github/actions/spelling/expect.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 77a33eafb1f..6d9f5b81b59 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -61,3 +61,4 @@ pluginindicator TobiasSekan Img img +resx \ No newline at end of file From 46e1385a0f85fd84991a8f3b49a50c981c6f55b4 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:01:01 +0800 Subject: [PATCH 13/18] fix branch head --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index fbd25193f7e..be9a59e9f3b 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -65,7 +65,7 @@ jobs: outputs: followup: ${{ steps.spelling.outputs.followup }} runs-on: ubuntu-latest - if: contains(github.event_name, 'pull_request') && github.head_ref != 'ref/heads/l10n_dev' || github.event_name == 'push' + if: (contains(github.event_name, 'pull_request') && github.head_ref != 'refs/heads/l10n_dev') || github.event_name == 'push' concurrency: group: spelling-${{ github.event.pull_request.number || github.ref }} # note: If you use only_check_changed_files, you do not want cancel-in-progress From ceab134ad4b4cb2777e281147299c7e4ab4b8d54 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:05:18 +0800 Subject: [PATCH 14/18] update newline --- .github/actions/spelling/expect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 6d9f5b81b59..a91287cc034 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -61,4 +61,4 @@ pluginindicator TobiasSekan Img img -resx \ No newline at end of file +resx From 97ca208bd0e2b72bd6a257e157a1bc4215269a83 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:26:18 +0800 Subject: [PATCH 15/18] update regex --- .github/actions/spelling/excludes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index ecf231f8850..224014ebac5 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -57,12 +57,12 @@ ^\.github/actions/spelling/ ^\Q.github/workflows/spelling.yml\E$ # Custom -(?:^|/)Languages/(?!en.xaml) +(?:^|/)Languages/(?!en\.xaml) Scripts/ \.resx$ ^\QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E$ ^\QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E$ -(?:^|/)FodyWeavers.xml +(?:^|/)FodyWeavers\.xml .editorconfig ignore$ \.ps1$ From 234dfbf5ce63521053e8cc773ec8b009a6823a15 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:41:36 +0800 Subject: [PATCH 16/18] test --- .github/workflows/spelling.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index be9a59e9f3b..e5f1502ae0a 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -71,6 +71,7 @@ jobs: # note: If you use only_check_changed_files, you do not want cancel-in-progress cancel-in-progress: false steps: + - run: echo "🔎 The name of your branch is ${{ github.head_ref }} and your repository is ${{ github.repository }}." - name: check-spelling id: spelling uses: check-spelling/check-spelling@main From 42447a52cc20e737225effb7dcf82422bbd3a5e0 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:47:32 +0800 Subject: [PATCH 17/18] remove test code --- .github/workflows/spelling.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index e5f1502ae0a..be9a59e9f3b 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -71,7 +71,6 @@ jobs: # note: If you use only_check_changed_files, you do not want cancel-in-progress cancel-in-progress: false steps: - - run: echo "🔎 The name of your branch is ${{ github.head_ref }} and your repository is ${{ github.repository }}." - name: check-spelling id: spelling uses: check-spelling/check-spelling@main From 4673120eb0cfdba934a9b7eebc45cebb90cf2bad Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:47:57 +0800 Subject: [PATCH 18/18] Exclude l10n_dev branch --- .github/workflows/spelling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index be9a59e9f3b..6037c100e1a 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -65,7 +65,7 @@ jobs: outputs: followup: ${{ steps.spelling.outputs.followup }} runs-on: ubuntu-latest - if: (contains(github.event_name, 'pull_request') && github.head_ref != 'refs/heads/l10n_dev') || github.event_name == 'push' + if: (contains(github.event_name, 'pull_request') && github.head_ref != 'l10n_dev') || github.event_name == 'push' concurrency: group: spelling-${{ github.event.pull_request.number || github.ref }} # note: If you use only_check_changed_files, you do not want cancel-in-progress