Merge pull request #336 from Lombiq/issue/LMBQ-267

LMBQ-267: Adding "XSS" to the Security spelling dictionary, centralized Add/Remove Label internal action
Lombiq · Apr 2, 2024 · 7b5a5b2 · 7b5a5b2
2 parents 95f5d72 + 04911c9
commit 7b5a5b2
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 9 deletions.
diff --git a/.github/actions/add-remove-label/action.yml b/.github/actions/add-remove-label/action.yml
@@ -0,0 +1,35 @@
+name: Add/Remove Label
+description: >
+  Runs buildsville/add-remove-label. Exists only to centralize which version of the action we use. Intentionally not
+  documented in Actions.md since it's only meant for internal use.
+
+# Copied from https://github.com/buildsville/add-remove-label/blob/master/action.yml.
+inputs:
+  token:
+    description: 'github token'
+    required: true
+    default: ''
+  labels:
+    description: 'labels to edit'
+    required: false
+    default: ''
+  label:
+    description: 'label to edit'
+    required: false
+    default: ''
+  type:
+    description: 'add or remove'
+    required: true
+    default: ''
+
+runs:
+  using: "composite"
+  steps:
+    - name: Add/Remove Label
+      # v2.0.1
+      uses: buildsville/add-remove-label@ac59c9f0aeb66eb12d6366eb1d69ec1906e9ef9a
+      with:
+        token: ${{ inputs.token }}
+        labels: ${{ inputs.labels }}
+        label: ${{ inputs.label }}
+        type: ${{ inputs.type }}
diff --git a/.github/actions/auto-merge-pull-request/action.yml b/.github/actions/auto-merge-pull-request/action.yml
@@ -37,8 +37,7 @@ runs:
 
     - name: Remove Label
       if: steps.check-mergeability.outputs.contains-label == 'true'
-      # v2.0.0
-      uses: buildsville/add-remove-label@eeae411a9be2e173f2420e1644514edbecc4e835
+      uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev
       with:
         token: ${{ env.GITHUB_TOKEN }}
         labels: merge-if-checks-succeed

diff --git a/.github/actions/auto-transition-jira-issue/action.yml b/.github/actions/auto-transition-jira-issue/action.yml
@@ -41,8 +41,7 @@ runs:
         Set-JiraIssueStatus @parameters
 
     - name: Remove Label
-      # v2.0.0
-      uses: buildsville/add-remove-label@eeae411a9be2e173f2420e1644514edbecc4e835
+      uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev
       with:
         token: ${{ env.GITHUB_TOKEN }}
         labels: merge-and-resolve-jira-issue-if-checks-succeed, resolve-jira-issue-if-checks-succeed, done-jira-issue-if-checks-succeed

diff --git a/.github/actions/spelling/dictionaries/Security.txt b/.github/actions/spelling/dictionaries/Security.txt
@@ -3,3 +3,5 @@ clickjacking
 nosniff
 softwaresecurityproject
 PII
+XSS
+Xss
diff --git a/.github/actions/verify-dotnet-consolidation/action.yml b/.github/actions/verify-dotnet-consolidation/action.yml
@@ -17,7 +17,9 @@ inputs:
   exclude-version-regex:
     required: false
     default: '\-alpha'
-    description: A regular expression to match package versions that will be skipped during checking.
+    description: >
+      A regular expression to match package versions that will be skipped during NuGet package consolidation. See the
+      dotnet consolidate docs for details: https://github.com/olsh/dotnet-consolidate?tab=readme-ov-file#usage.
 
 runs:
   using: "composite"

diff --git a/.github/workflows/build-and-test-dotnet.yml b/.github/workflows/build-and-test-dotnet.yml
@@ -136,7 +136,8 @@ on:
         required: false
         default: '\-alpha'
         description: >
-          A regular expression to match package versions that will be skipped during NuGet package consolidation.
+          A regular expression to match package versions that will be skipped during NuGet package consolidation. See
+          the dotnet consolidate docs for details: https://github.com/olsh/dotnet-consolidate?tab=readme-ov-file#usage.
       warnings-as-errors:
         type: string
         default: 'true'

diff --git a/.github/workflows/build-and-test-orchard-core.yml b/.github/workflows/build-and-test-orchard-core.yml
@@ -163,7 +163,8 @@ on:
         required: false
         default: '\-alpha'
         description: >
-          A regular expression to match package versions that will be skipped during NuGet package consolidation.
+          A regular expression to match package versions that will be skipped during NuGet package consolidation. See
+          the dotnet consolidate docs for details: https://github.com/olsh/dotnet-consolidate?tab=readme-ov-file#usage.
       warnings-as-errors:
         type: string
         default: 'true'

diff --git a/.github/workflows/post-pull-request-checks-automation.yml b/.github/workflows/post-pull-request-checks-automation.yml
@@ -93,8 +93,7 @@ jobs:
 
       - name: Remove Label
         if: steps.check-steps-should-run.outputs.is-latest != 'false'
-        # v2.0.0
-        uses: buildsville/add-remove-label@eeae411a9be2e173f2420e1644514edbecc4e835
+        uses: Lombiq/GitHub-Actions/.github/actions/add-remove-label@dev
         with:
           token: ${{ env.MERGE_TOKEN }}
           labels: merge-and-resolve-jira-issue-if-checks-succeed