diff --git a/.github/LICENSE.actionlint-matcher.json b/.github/LICENSE.actionlint-matcher.json deleted file mode 100644 index a6c940dcb..000000000 --- a/.github/LICENSE.actionlint-matcher.json +++ /dev/null @@ -1,22 +0,0 @@ -https://raw.githubusercontent.com/rhysd/actionlint/0ba78a0/LICENSE.txt - -the MIT License - -Copyright (c) 2021 rhysd - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/.github/actionlint-matcher.json b/.github/actionlint-matcher.json deleted file mode 100644 index 4613e1617..000000000 --- a/.github/actionlint-matcher.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "problemMatcher": [ - { - "owner": "actionlint", - "pattern": [ - { - "regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$", - "file": 1, - "line": 2, - "column": 3, - "message": 4, - "code": 5 - } - ] - } - ] -} diff --git a/.github/actions/actionlint/action.yml b/.github/actions/actionlint/action.yml index 821e7b26d..0cd465cf4 100644 --- a/.github/actions/actionlint/action.yml +++ b/.github/actions/actionlint/action.yml @@ -16,12 +16,21 @@ runs: env: ACTIONLINT: '${{ steps.install.outputs.executable }}' run: | - echo "::add-matcher::.github/actionlint-matcher.json" + cat <<'EOF' >actionlint-matcher.json + {"problemMatcher": [{ + "owner": "actionlint", + "pattern": [{ + "regexp": "^(.+?):(\\d+):(\\d+): (.+?) \\[(.+?)\\]$", + "file": 1, "line": 2, "column": 3, "message": 4, "code": 5 + }] + }]} + EOF + echo "::add-matcher::actionlint-matcher.json" # TODO: move non-global ignores inline or to in-tree actionlint.yml once # https://www.github.com/rhysd/actionlint/issues/237 and/or # https://www.github.com/rhysd/actionlint/issues/217 is fixed. # TODO: remove -ignore "property .runner. is not defined" once # https://www.github.com/rhysd/actionlint/issues/77 is fixed. - "$ACTIONLINT" -color \ + "$ACTIONLINT" -no-color \ -ignore "property .runner. is not defined" \ -ignore "property .repository_visibility. is not defined"