diff --git a/.github/actions/set-gha-refs/Set-Called-GHA-Refs.ps1 b/.github/actions/set-gha-refs/Set-Called-GHA-Refs.ps1 index d2a81eca7..42dee32a1 100644 --- a/.github/actions/set-gha-refs/Set-Called-GHA-Refs.ps1 +++ b/.github/actions/set-gha-refs/Set-Called-GHA-Refs.ps1 @@ -12,7 +12,7 @@ if ($CalledRepoBaseIncludeList.Count -eq 0) } else { - $CalledRepoBaseIncludeList = $CalledRepoBaseIncludeList.ForEach({ 'uses:\s*' + $PSItem + '.*@(?[aA-zZ,0-9,-,\.,/,_]*)' }) + $CalledRepoBaseIncludeList = $CalledRepoBaseIncludeList.ForEach({ 'uses:\s*' + $PSItem + '.*@(?[\w\./-]*)' }) $matchedRefs = Get-ChildItem -Path $PathIncludeList -Include $FileIncludeList -Force -Recurse | Select-String -Pattern $CalledRepoBaseIncludeList diff --git a/.github/actions/set-gha-refs/action.yml b/.github/actions/set-gha-refs/action.yml index e93f9ef1e..d099d6cc7 100644 --- a/.github/actions/set-gha-refs/action.yml +++ b/.github/actions/set-gha-refs/action.yml @@ -27,8 +27,8 @@ inputs: default: '@()' description: > PowerShell string array of additional RegEx patterns to include when searching for branch references that need to - be updated, e.g. 'https://raw.githubusercontent.com/Lombiq/GitHub-Actions/(?[aA-zZ,0-9,-,\.,/,_]*)/.github/'. - The pattern MUST include a regex named capture group (?[aA-zZ,0-9,-,\.,/,_]*) so the captured ref can be + be updated, e.g. 'https://raw.githubusercontent.com/Lombiq/GitHub-Actions/(?[\w\./-]*)/.github/'. + The pattern MUST include a regex named capture group (?[\w\./-]*) so the captured ref can be updated correctly. The parameter must be a PowerShell string array. expected-ref: required: true diff --git a/.github/workflows/tag-version-this-repo.yml b/.github/workflows/tag-version-this-repo.yml index 5466512f7..a791d4829 100644 --- a/.github/workflows/tag-version-this-repo.yml +++ b/.github/workflows/tag-version-this-repo.yml @@ -11,6 +11,6 @@ jobs: if: github.event.pusher.name != 'LombiqBot' uses: Lombiq/GitHub-Actions/.github/workflows/tag-version.yml@issue/OSOE-735 with: - additional-pattern-include-list: '@("https://raw.githubusercontent.com/Lombiq/GitHub-Actions/(?[aA-zZ,0-9,-,\.,/,_]*)/.github")' + additional-pattern-include-list: '@("https://raw.githubusercontent.com/Lombiq/GitHub-Actions/(?[\w\./-]*)/.github")' secrets: TAG_VERSION_TOKEN: ${{ secrets.LOMBIQBOT_GITHUB_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml index fff677a56..7ff0107d2 100644 --- a/.github/workflows/tag-version.yml +++ b/.github/workflows/tag-version.yml @@ -47,8 +47,8 @@ on: description: > PowerShell string array of additional RegEx patterns to include when searching for branch references that need to be updated, e.g. - 'https://raw.githubusercontent.com/Lombiq/GitHub-Actions/(?[aA-zZ,0-9,-,\.,/,_]*)/.github/'. The pattern - MUST include a regex named capture group (?[aA-zZ,0-9,-,\.,/,_]*) so the captured ref can be updated + 'https://raw.githubusercontent.com/Lombiq/GitHub-Actions/(?[\w\./-]*)/.github/'. The pattern + MUST include a regex named capture group (?[\w\./-]*) so the captured ref can be updated correctly. The parameter must be a PowerShell string array. type: string expected-ref: