Skip to content

Commit 3c67ce2

Browse files
authored
Merge pull request #16 from norio-nomura/fix-col
Fix col and prepare 3.0.1
2 parents 599cea3 + 336881f commit 3c67ce2

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM norionomura/swiftlint:swift-5.1
2-
LABEL version="3.0.0"
2+
LABEL version="3.0.1"
33
LABEL repository="https://github.com/norio-nomura/action-swiftlint"
44
LABEL homepage="https://github.com/norio-nomura/action-swiftlint"
55
LABEL maintainer="Norio Nomura <[email protected]>"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v1
2424
- name: GitHub Action for SwiftLint
25-
uses: norio-nomura/[email protected].0
25+
uses: norio-nomura/[email protected].1
2626
```
2727
2828
## Secrets

entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function stripPWD() {
88
}
99

1010
function convertToGitHubActionsLoggingCommands() {
11-
sed -E 's/^(.*):([0-9]+):([0-9]+): (warning|error|[^:]+): (.*)/::\4 file=\1,line=\2,column=\3::\5/'
11+
sed -E 's/^(.*):([0-9]+):([0-9]+): (warning|error|[^:]+): (.*)/::\4 file=\1,line=\2,col=\3::\5/'
1212
}
1313

1414
set -o pipefail && swiftlint "$@" | stripPWD | convertToGitHubActionsLoggingCommands

test/Warnings/expected.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
::warning file=Package.swift,line=12,column=35::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
2-
::warning file=Package.swift,line=20,column=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
3-
::warning file=Package.swift,line=26,column=40::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
4-
::warning file=Tests/WarningsTests/WarningsTests.swift,line=13,column=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
5-
::warning file=Tests/WarningsTests/XCTestManifests.swift,line=6,column=41::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
1+
::warning file=Package.swift,line=12,col=35::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
2+
::warning file=Package.swift,line=20,col=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
3+
::warning file=Package.swift,line=26,col=40::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
4+
::warning file=Tests/WarningsTests/WarningsTests.swift,line=13,col=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
5+
::warning file=Tests/WarningsTests/XCTestManifests.swift,line=6,col=41::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)

test/errors/expected.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
::error file=Sources/errors/errors.swift,line=1,column=8::Type Name Violation: Type name should start with an uppercase character: 'errors' (type_name)
2-
::error file=Tests/errorsTests/errorsTests.swift,line=4,column=13::Type Name Violation: Type name should start with an uppercase character: 'errorsTests' (type_name)
3-
::warning file=Package.swift,line=12,column=33::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
4-
::warning file=Package.swift,line=20,column=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
5-
::warning file=Package.swift,line=26,column=38::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
6-
::warning file=Tests/errorsTests/XCTestManifests.swift,line=6,column=39::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
7-
::warning file=Tests/errorsTests/errorsTests.swift,line=13,column=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
1+
::error file=Sources/errors/errors.swift,line=1,col=8::Type Name Violation: Type name should start with an uppercase character: 'errors' (type_name)
2+
::error file=Tests/errorsTests/errorsTests.swift,line=4,col=13::Type Name Violation: Type name should start with an uppercase character: 'errorsTests' (type_name)
3+
::warning file=Package.swift,line=12,col=33::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
4+
::warning file=Package.swift,line=20,col=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
5+
::warning file=Package.swift,line=26,col=38::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
6+
::warning file=Tests/errorsTests/XCTestManifests.swift,line=6,col=39::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
7+
::warning file=Tests/errorsTests/errorsTests.swift,line=13,col=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)

0 commit comments

Comments
 (0)