Merge pull request #6 from norio-nomura/update-to-latest

Update to latest

Author: norio-nomura

.github/workflows/push.yml .github/workflows/ci.yml

@@ -1,5 +1,5 @@
-on: push
-name: New workflow
+name: CI
+on: [push]
 jobs:
   dockerLint:
     name: Docker Lint
@@ -11,7 +11,7 @@ jobs:
       with:
         args: Dockerfile
     - name: swift test
-      uses: docker://norionomura/swiftlint:swift-4.2
+      uses: docker://norionomura/swiftlint:swift-5
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

Dockerfile

@@ -1,5 +1,5 @@
-FROM norionomura/swiftlint:swift-4.2
-LABEL version="0.1.0"
+FROM norionomura/swiftlint:swift-5
+LABEL version="2.0.0"
 LABEL repository="https://github.com/norio-nomura/action-swiftlint"
 LABEL homepage="https://github.com/norio-nomura/action-swiftlint"
 LABEL maintainer="Norio Nomura <[email protected]>"

README.md

@@ -6,16 +6,22 @@ This Action executes [SwiftLint](https://github.com/realm/SwiftLint) and generat
 
 An example workflow to executing SwiftLint follows:
 
-```hcl
-workflow "Execute SwiftLint" {
-  on = "push"
-  resolves = ["swiftlint"]
-}
-
-action "swiftlint" {
-  uses = "norio-nomura/action-swiftlint@master"
-  secrets = ["GITHUB_TOKEN"]
-}
+```yaml
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    - name: GitHub Action for SwiftLint
+      uses: norio-nomura/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
 
 ## Secrets

Sources/Lib/GitHub.swift

@@ -29,13 +29,14 @@ extension GitHub.Repository {
         public var url: URL
         public var output: Output?
         public var app: App
+        public var check_suite: CheckSuite
     }
 }
 
 extension GitHub.Repository.CheckRun {
     public struct Output: Decodable {
-        public var title: String
-        public var summary: String
+        public var title: String?
+        public var summary: String?
         public var text: String?
         public var annotations: [Annotation]?
     }
@@ -79,22 +80,25 @@ extension GitHub.Repository.CheckRun {
         public var id: Int
         public var name: String
     }
+
+    public struct CheckSuite: Decodable {
+        public var id: Int
+    }
 }
 
 extension GitHub.Repository {
     public func currentCheckRun() -> CheckRun? {
         guard let sha = environment("GITHUB_SHA") else { return nil }
-        guard let name = environment("GITHUB_ACTION") else { return nil }
-        guard let checkRun = findCheckRun(for: sha, with: name) else {
-            print("Current Action `\(name)` not found!")
+        guard let checkRun = findCheckRun(for: sha) else {
+            print("Current Action not found!")
             return nil
         }
         return checkRun
     }
 
-    public func findCheckRun(for ref: String, with name: String) -> CheckRun? {
+    public func findCheckRun(for ref: String) -> CheckRun? {
         return checkRuns(for: ref).first { checkRun -> Bool in
-            checkRun.name == name && checkRun.app.name == "GitHub Actions"
+            checkRun.app.name == "GitHub Actions"
         }
     }
 
@@ -103,8 +107,10 @@ extension GitHub.Repository {
             var check_runs: [CheckRun]
         }
 
-        let response: Response? = request(url(with: "/repos/\(repo)/commits/\(ref)/check-runs"))
-        return response?.check_runs ?? []
+        let response1: Response? = request(url(with: "/repos/\(repo)/commits/\(ref)/check-runs"))
+        guard let suite_id = response1?.check_runs.first?.check_suite.id else { return [] }
+        let response2: Response? = request(url(with: "/repos/\(repo)/check-suites/\(suite_id)/check-runs"))
+        return response2?.check_runs ?? []
     }
 
     @discardableResult
@@ -118,16 +124,17 @@ extension GitHub.Repository {
             var output: Output
         }
 
-        guard let output = checkRun.output else {
-            print("\(checkRun) has no output.")
-            return false
-        }
+        let title = "SwiftLint Violations"
+        let warnings = annotations.filter { $0.annotation_level == .warning }.count
+        let failure = annotations.filter { $0.annotation_level == .failure }.count
+        let summary = "warnings: \(warnings), failures: \(failure)"
+
         let batchSize = 50
         var rest = ArraySlice(annotations)
         while !rest.isEmpty {
             let annotations = Array(rest.prefix(batchSize))
             rest = rest.dropFirst(batchSize)
-            let output = Request.Output(title: output.title, summary: output.summary, annotations: annotations)
+            let output = Request.Output(title: title, summary: summary, annotations: annotations)
             let response: CheckRun? = request(checkRun.url, method: "PATCH", with: Request(output: output))
             if response == nil {
                 return false
@@ -174,6 +181,9 @@ extension GitHub.Repository {
             }
             guard (200...299).contains(httpURLResponse.statusCode) else {
                 print("server error status: \(httpURLResponse.statusCode)")
+                if let data = data, let output = String(data: data, encoding: .utf8) {
+                    print(output)
+                }
                 return
             }
             guard let data = data else {

Tests/action-swiftlintTests/TestHelper.swift

@@ -3,16 +3,36 @@ import Foundation
 let projectRootURL = URL(fileURLWithPath: #file).deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent()
 let projectRootPath = projectRootURL.appendingPathComponent("/").path
 
-extension String {
+private struct StaticStringImitator {
+    let string: String
+
     func withStaticString(_ closure: (StaticString) -> Void) {
-        withCString {
-            let rawPointer = $0._rawValue
-            let byteSize = lengthOfBytes(using: .utf8)._builtinWordValue
-            let isASCII = true._getBuiltinLogicValue()
-            let staticString = StaticString(_builtinStringLiteral: rawPointer,
-                                            utf8CodeUnitCount: byteSize,
-                                            isASCII: isASCII)
-            closure(staticString)
+        let isASCII = string.utf8.allSatisfy { $0 < 0x7f }
+        string.utf8CString.dropLast().withUnsafeBytes {
+            let imitator = Imitator(startPtr: $0.baseAddress!, utf8CodeUnitCount: $0.count, isASCII: isASCII)
+            closure(imitator.staticString)
         }
     }
+
+    struct Imitator {
+        let startPtr: UnsafeRawPointer
+        let utf8CodeUnitCount: Int
+        let flags: Int8
+
+        init(startPtr: UnsafeRawPointer, utf8CodeUnitCount: Int, isASCII: Bool) {
+            self.startPtr = startPtr
+            self.utf8CodeUnitCount = utf8CodeUnitCount
+            flags = isASCII ? 0x2 : 0x0
+        }
+
+        var staticString: StaticString {
+            return unsafeBitCast(self, to: StaticString.self)
+        }
+    }
+}
+
+extension String {
+    func withStaticString(_ closure: (StaticString) -> Void) {
+        StaticStringImitator(string: self).withStaticString(closure)
+    }
 }

Tests/action-swiftlintTests/action_swiftlintTests.swift

@@ -12,11 +12,11 @@ final class action_swiftlintTests: XCTestCase {
             "Can not find `GITHUB_TOKEN` environment variable.\n" : ""
 
         XCTAssertEqual(output, """
-Sources/Lib/GitHub.swift:44:16: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
-Sources/Lib/GitHub.swift:102:9: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
-Sources/Lib/GitHub.swift:112:9: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
-Sources/Lib/GitHub.swift:113:13: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
-Sources/Lib/GitHub.swift:113:13: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
+Sources/Lib/GitHub.swift:45:16: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
+Sources/Lib/GitHub.swift:106:9: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
+Sources/Lib/GitHub.swift:118:9: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
+Sources/Lib/GitHub.swift:119:13: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
+Sources/Lib/GitHub.swift:119:13: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
 Sources/Lib/SwiftLint.swift:6:16: warning: Nesting Violation: Types should be nested at most 1 level deep (nesting)
 Sources/Lib/execute().swift:4:68: warning: Large Tuple Violation: Tuples should have at most 2 members. (large_tuple)
 \(warningMessage)

action.yml

@@ -0,0 +1,6 @@
+name: 'GitHub Action for SwiftLint'
+description: 'A tool to enforce Swift style and conventions'
+author: 'Norio Nomura <[email protected]>'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'