Merge pull request #16 from norio-nomura/fix-col

Fix col and prepare 3.0.1
norio-nomura · Nov 4, 2019 · 3c67ce2 · 3c67ce2
2 parents 599cea3 + 336881f
commit 3c67ce2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM norionomura/swiftlint:swift-5.1
-LABEL version="3.0.0"
+LABEL version="3.0.1"
 LABEL repository="https://github.com/norio-nomura/action-swiftlint"
 LABEL homepage="https://github.com/norio-nomura/action-swiftlint"
 LABEL maintainer="Norio Nomura <norio.nomura@gmail.com>"

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: GitHub Action for SwiftLint
-        uses: norio-nomura/action-swiftlint@3.0.0
+        uses: norio-nomura/action-swiftlint@3.0.1
 ```
 
 ## Secrets

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -8,7 +8,7 @@ function stripPWD() {
 }
 
 function convertToGitHubActionsLoggingCommands() {
-    sed -E 's/^(.*):([0-9]+):([0-9]+): (warning|error|[^:]+): (.*)/::\4 file=\1,line=\2,column=\3::\5/'
+    sed -E 's/^(.*):([0-9]+):([0-9]+): (warning|error|[^:]+): (.*)/::\4 file=\1,line=\2,col=\3::\5/'
 }
 
 set -o pipefail && swiftlint "$@" | stripPWD | convertToGitHubActionsLoggingCommands
diff --git a/test/Warnings/expected.txt b/test/Warnings/expected.txt
@@ -1,5 +1,5 @@
-::warning file=Package.swift,line=12,column=35::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
-::warning file=Package.swift,line=20,column=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
-::warning file=Package.swift,line=26,column=40::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
-::warning file=Tests/WarningsTests/WarningsTests.swift,line=13,column=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
-::warning file=Tests/WarningsTests/XCTestManifests.swift,line=6,column=41::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Package.swift,line=12,col=35::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Package.swift,line=20,col=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
+::warning file=Package.swift,line=26,col=40::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Tests/WarningsTests/WarningsTests.swift,line=13,col=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Tests/WarningsTests/XCTestManifests.swift,line=6,col=41::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
diff --git a/test/errors/expected.txt b/test/errors/expected.txt
@@ -1,7 +1,7 @@
-::error file=Sources/errors/errors.swift,line=1,column=8::Type Name Violation: Type name should start with an uppercase character: 'errors' (type_name)
-::error file=Tests/errorsTests/errorsTests.swift,line=4,column=13::Type Name Violation: Type name should start with an uppercase character: 'errorsTests' (type_name)
-::warning file=Package.swift,line=12,column=33::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
-::warning file=Package.swift,line=20,column=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
-::warning file=Package.swift,line=26,column=38::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
-::warning file=Tests/errorsTests/XCTestManifests.swift,line=6,column=39::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
-::warning file=Tests/errorsTests/errorsTests.swift,line=13,column=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::error file=Sources/errors/errors.swift,line=1,col=8::Type Name Violation: Type name should start with an uppercase character: 'errors' (type_name)
+::error file=Tests/errorsTests/errorsTests.swift,line=4,col=13::Type Name Violation: Type name should start with an uppercase character: 'errorsTests' (type_name)
+::warning file=Package.swift,line=12,col=33::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Package.swift,line=20,col=1::Line Length Violation: Line should be 120 characters or less: currently 122 characters (line_length)
+::warning file=Package.swift,line=26,col=38::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Tests/errorsTests/XCTestManifests.swift,line=6,col=39::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)
+::warning file=Tests/errorsTests/errorsTests.swift,line=13,col=37::Trailing Comma Violation: Collection literals should not have trailing commas. (trailing_comma)