Skip to content

Commit 9604394

Browse files
authored
Merge pull request #53 from asaasdev/feature/failed-on-invalid-rules-file
Ajuste para falhar quando arquivos de regras estiver inválido
2 parents ca7a4a9 + 8c9056d commit 9604394

File tree

7 files changed

+106
-29
lines changed

7 files changed

+106
-29
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
main:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616

1717
- name: Docker meta
1818
id: meta
@@ -25,20 +25,20 @@ jobs:
2525
type=semver,pattern={{raw}}
2626
2727
- name: Set up QEMU
28-
uses: docker/setup-qemu-action@v1.2.0
28+
uses: docker/setup-qemu-action@v2
2929

3030
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v1.6.0
31+
uses: docker/setup-buildx-action@v2
3232

3333
- name: Login to DockerHub
34-
uses: docker/login-action@v1.10.0
34+
uses: docker/login-action@v2
3535
with:
3636
username: ${{ secrets.DOCKERHUB_USERNAME }}
3737
password: ${{ secrets.DOCKERHUB_TOKEN }}
3838

3939
- name: Build and push
4040
id: docker_build
41-
uses: docker/build-push-action@v2.7.0
41+
uses: docker/build-push-action@v3
4242
with:
4343
push: true
4444
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/depup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
reviewdog:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2.3.4
14-
- uses: haya14busa/action-depup@v1.4.4
13+
- uses: actions/checkout@v3
14+
- uses: haya14busa/action-depup@v1
1515
id: depup
1616
with:
1717
file: Dockerfile

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.event.action != 'labeled'
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2.3.4
15+
- uses: actions/checkout@v3
1616

1717
# Bump version on merging Pull Requests with specific labels.
1818
# (bump:major,bump:minor,bump:patch)
@@ -52,28 +52,28 @@ jobs:
5252
needs: release
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v2
55+
- uses: actions/checkout@v3
5656

5757
- uses: actions-ecosystem/action-get-latest-tag@v1
5858
id: get-latest-tag
5959
with:
6060
semver_only: true
6161

6262
- name: Set up QEMU
63-
uses: docker/setup-qemu-action@v1.2.0
63+
uses: docker/setup-qemu-action@v2
6464

6565
- name: Set up Docker Buildx
66-
uses: docker/setup-buildx-action@v1.6.0
66+
uses: docker/setup-buildx-action@v2
6767

6868
- name: Login to DockerHub
69-
uses: docker/login-action@v1.10.0
69+
uses: docker/login-action@v2
7070
with:
7171
username: ${{ secrets.DOCKERHUB_USERNAME }}
72-
password: ${{ secrets.DOCKERHUB_TOKEN }}
72+
password: ${{ secrets.DOCKERHUB_TOKEN }}
7373

7474
- name: Build and push
7575
id: docker_build
76-
uses: docker/build-push-action@v2.7.0
76+
uses: docker/build-push-action@v3
7777
with:
7878
push: true
7979
tags: |
@@ -87,7 +87,7 @@ jobs:
8787
if: github.event.action == 'labeled'
8888
runs-on: ubuntu-latest
8989
steps:
90-
- uses: actions/checkout@v2.3.4
90+
- uses: actions/checkout@v3
9191

9292
- name: Post bumpr status comment
9393
uses: haya14busa/action-bumpr@v1

.github/workflows/reviewdog.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
name: runner / shellcheck
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2.3.4
12+
- uses: actions/checkout@v3
1313
- uses: haya14busa/action-cond@v1
1414
id: reporter
1515
with:
1616
cond: ${{ github.event_name == 'pull_request' }}
1717
if_true: "github-pr-review"
1818
if_false: "github-check"
19-
- uses: reviewdog/action-shellcheck@v1.9
19+
- uses: reviewdog/action-shellcheck@v1
2020
with:
2121
github_token: ${{ secrets.github_token }}
2222
reporter: ${{ steps.reporter.outputs.value }}
@@ -26,14 +26,14 @@ jobs:
2626
name: runner / hadolint
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v2.3.4
29+
- uses: actions/checkout@v3
3030
- uses: haya14busa/action-cond@v1
3131
id: reporter
3232
with:
3333
cond: ${{ github.event_name == 'pull_request' }}
3434
if_true: "github-pr-review"
3535
if_false: "github-check"
36-
- uses: reviewdog/action-hadolint@v1.25
36+
- uses: reviewdog/action-hadolint@v1
3737
with:
3838
github_token: ${{ secrets.github_token }}
3939
reporter: ${{ steps.reporter.outputs.value }}
@@ -43,7 +43,7 @@ jobs:
4343
name: runner / misspell
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v2.3.4
46+
- uses: actions/checkout@v3
4747
- uses: reviewdog/action-misspell@v1
4848
with:
4949
github_token: ${{ secrets.github_token }}
@@ -54,7 +54,7 @@ jobs:
5454
name: runner / alex
5555
runs-on: ubuntu-latest
5656
steps:
57-
- uses: actions/checkout@v2.3.4
57+
- uses: actions/checkout@v3
5858
- uses: reviewdog/action-alex@v1
5959
with:
6060
github_token: ${{ secrets.github_token }}

README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,22 @@ CodeNarc image with reviewdog.
44

55
- codenarc/codenarc:2.2.0-groovy3.0.8
66
- reviewdog v0.13.0
7+
8+
## Test local
9+
10+
```
11+
# build image
12+
docker build -t docker.io/asaasdev/codenarc .
13+
14+
# run container
15+
docker run --rm \
16+
--workdir /testdata \
17+
-e INPUT_REPORTER=local \
18+
-e INPUT_FILTER_MODE=nofilter \
19+
-e INPUT_FAIL_ON_ERROR=false \
20+
-e INPUT_LEVEL=error \
21+
-e INPUT_RULESETFILES=file:basic.xml \
22+
-v $(pwd)/testdata:/testdata \
23+
docker.io/asaasdev/codenarc
24+
25+
```

entrypoint.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ fi
99

1010
export REVIEWDOG_GITHUB_API_TOKEN="${INPUT_GITHUB_TOKEN}"
1111

12-
java -jar /lib/codenarc-all.jar -report="${INPUT_REPORT:-compact:stdout}" -rulesetfiles="${INPUT_RULESETFILES}" \
13-
| reviewdog -efm="%f:%l:%m" -efm="%f:%r:%m" \
14-
-name="codenarc" \
15-
-reporter="${INPUT_REPORTER:-github-pr-check}" \
16-
-filter-mode="${INPUT_FILTER_MODE}" \
17-
-fail-on-error="${INPUT_FAIL_ON_ERROR}" \
18-
-level="${INPUT_LEVEL}" \
19-
${INPUT_REVIEWDOG_FLAGS}
12+
java -jar /lib/codenarc-all.jar \
13+
-report="${INPUT_REPORT:-compact:stdout}" \
14+
-rulesetfiles="${INPUT_RULESETFILES}" \
15+
> result.txt
16+
17+
< result.txt reviewdog -efm="%f:%l:%m" -efm="%f:%r:%m" \
18+
-name="codenarc" \
19+
-reporter="${INPUT_REPORTER:-github-pr-check}" \
20+
-filter-mode="${INPUT_FILTER_MODE}" \
21+
-fail-on-error="${INPUT_FAIL_ON_ERROR}" \
22+
-level="${INPUT_LEVEL}" \
23+
${INPUT_REVIEWDOG_FLAGS}
24+
25+
rm result.txt

testdata/basic.xml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<ruleset xmlns="http://codenarc.org/ruleset/1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://codenarc.org/ruleset/1.0 http://codenarc.org/ruleset-schema.xsd"
4+
xsi:noNamespaceSchemaLocation="http://codenarc.org/ruleset-schema.xsd">
5+
6+
<description/>
7+
8+
<rule class='org.codenarc.rule.basic.AssertWithinFinallyBlockRule'/>
9+
<rule class='org.codenarc.rule.basic.AssignmentInConditionalRule'/>
10+
<rule class='org.codenarc.rule.basic.BigDecimalInstantiationRule'/>
11+
<rule class='org.codenarc.rule.basic.BitwiseOperatorInConditionalRule'/>
12+
<rule class='org.codenarc.rule.basic.BooleanGetBooleanRule'/>
13+
<rule class='org.codenarc.rule.basic.BrokenNullCheckRule'/>
14+
<rule class='org.codenarc.rule.basic.BrokenOddnessCheckRule'/>
15+
<rule class='org.codenarc.rule.basic.ClassForNameRule'/>
16+
<rule class='org.codenarc.rule.basic.ComparisonOfTwoConstantsRule'/>
17+
<rule class='org.codenarc.rule.basic.ComparisonWithSelfRule'/>
18+
<rule class='org.codenarc.rule.basic.ConstantAssertExpressionRule'/>
19+
<rule class='org.codenarc.rule.basic.ConstantTernaryExpressionRule'/>
20+
<rule class='org.codenarc.rule.basic.ConstantIfExpressionRule'/>
21+
<rule class='org.codenarc.rule.basic.DeadCodeRule'/>
22+
<rule class='org.codenarc.rule.basic.DoubleNegativeRule'/>
23+
<rule class='org.codenarc.rule.basic.DuplicateCaseStatementRule'/>
24+
<rule class='org.codenarc.rule.basic.DuplicateMapKeyRule'/>
25+
<rule class='org.codenarc.rule.basic.DuplicateSetValueRule'/>
26+
<rule class='org.codenarc.rule.basic.EmptyCatchBlockRule'/>
27+
<rule class='org.codenarc.rule.basic.EmptyClassRule'/>
28+
<rule class='org.codenarc.rule.basic.EmptyElseBlockRule'/>
29+
<rule class='org.codenarc.rule.basic.EmptyFinallyBlockRule'/>
30+
<rule class='org.codenarc.rule.basic.EmptyForStatementRule'/>
31+
<rule class='org.codenarc.rule.basic.EmptyIfStatementRule'/>
32+
<rule class='org.codenarc.rule.basic.EmptySwitchStatementRule'/>
33+
<rule class='org.codenarc.rule.basic.EmptySynchronizedStatementRule'/>
34+
<rule class='org.codenarc.rule.basic.EmptyStaticInitializerRule'/>
35+
<rule class='org.codenarc.rule.basic.EmptyTryBlockRule'/>
36+
<rule class='org.codenarc.rule.basic.EmptyWhileStatementRule'/>
37+
<rule class='org.codenarc.rule.basic.EmptyInstanceInitializerRule'/>
38+
<rule class='org.codenarc.rule.basic.EmptyMethodRule'/>
39+
<rule class='org.codenarc.rule.basic.EqualsAndHashCodeRule'/>
40+
<rule class='org.codenarc.rule.basic.EqualsOverloadedRule'/>
41+
<rule class='org.codenarc.rule.basic.ExplicitGarbageCollectionRule'/>
42+
<rule class='org.codenarc.rule.basic.ForLoopShouldBeWhileLoopRule'/>
43+
<rule class='org.codenarc.rule.basic.HardCodedWindowsFileSeparatorRule'/>
44+
<rule class='org.codenarc.rule.basic.HardCodedWindowsRootDirectoryRule'/>
45+
<rule class='org.codenarc.rule.basic.IntegerGetIntegerRule'/>
46+
<rule class='org.codenarc.rule.basic.MultipleUnaryOperatorsRule'/>
47+
<rule class='org.codenarc.rule.basic.RandomDoubleCoercedToZeroRule'/>
48+
<rule class='org.codenarc.rule.basic.RemoveAllOnSelfRule'/>
49+
<rule class='org.codenarc.rule.basic.ReturnFromFinallyBlockRule'/>
50+
<rule class='org.codenarc.rule.basic.ThrowExceptionFromFinallyBlockRule'/>
51+
<rule class='org.codenarc.rule.basic.ParameterAssignmentInFilterClosureRule'/>
52+
</ruleset>

0 commit comments

Comments
 (0)