Merge pull request #44 from akkyie/github-actions

Replace Willow w/ swift-log, Bitrise w/ GH Actions

Author: MaxDesiatov

.github/workflows/main.yml

@@ -0,0 +1,26 @@
+name: Build and test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      # Checks-out the repo. More at: https://github.com/actions/checkout
+      - uses: actions/checkout@v2
+      - name: Select Xcode version
+        run: sudo xcode-select -switch /Applications/Xcode_11.4.1.app
+      - name: Test in Debug
+        run: swift test -c debug
+
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Didstopia/[email protected]
+        with:
+          swift-action: test --enable-test-discovery

.gitignore

@@ -5,3 +5,4 @@
 /Tests/WAKitTests/XCTestManifests.swift
 
 /spectest
+.vscode

Package.resolved

@@ -18,7 +18,7 @@ let package = Package(
         .package(url: "https://github.com/akkyie/SwiftLEB", from: "0.1.0"),
         .package(url: "https://github.com/jakeheis/SwiftCLI", from: "5.0.0"),
         .package(url: "https://github.com/onevcat/Rainbow", from: "3.1.4"),
-        .package(url: "https://github.com/Nike-Inc/Willow", from: "5.1.0"),
+        .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
     ],
     targets: [
         .target(
@@ -33,7 +33,7 @@ let package = Package(
         ),
         .target(
             name: "CLI",
-            dependencies: ["WAKit", "SwiftCLI", "Rainbow", "Willow"],
+            dependencies: ["WAKit", "SwiftCLI", "Rainbow", "Logging"],
             path: "./Sources/CLI"
         ),
     ],

Package.swift

@@ -1,7 +1,9 @@
 import Foundation
+import Logging
 import SwiftCLI
 import WAKit
-import Willow
+
+private let logger = Logger(label: "com.WAKit.CLI")
 
 final class RunCommand: Command {
     let name = "run"
@@ -11,33 +13,33 @@ final class RunCommand: Command {
     let functionName = Parameter()
     let arguments = OptionalCollectedParameter()
 
-    lazy var logger: Logger = {
-        Logger(
-            logLevels: isVerbose.value ? [.error, .warn, .event, .info] : [.error, .warn],
-            writers: [ConsoleWriter()]
-        )
-    }()
-
     func execute() throws {
         let isVerbose = self.isVerbose.value
+
+        LoggingSystem.bootstrap {
+            var handler = StreamLogHandler.standardOutput(label: $0)
+            handler.logLevel = isVerbose ? .info : .warning
+            return handler
+        }
+
         let path = self.path.value
         let functionName = self.functionName.value
 
         guard let fileHandle = FileHandle(forReadingAtPath: path) else {
-            logger.errorMessage("File \"\(path)\" could not be opened")
+            logger.error("File \"\(path)\" could not be opened")
             return
         }
         defer { fileHandle.closeFile() }
 
         let stream = FileHandleStream(fileHandle: fileHandle)
 
-        logger.eventMessage("Started to parse module")
+        logger.info("Started to parse module")
 
         let (module, parseTime) = try measure(if: isVerbose) {
             try WASMParser.parse(stream: stream)
         }
 
-        logger.eventMessage("Ended to parse module: \(parseTime)")
+        logger.info("Ended to parse module: \(parseTime)")
 
         let runtime = Runtime()
         let moduleInstance = try runtime.instantiate(module: module, externalValues: [])
@@ -57,13 +59,13 @@ final class RunCommand: Command {
             parameters.append(parameter)
         }
 
-        logger.eventMessage("Started invoking function \"\(functionName)\" with parameters: \(parameters)")
+        logger.info("Started invoking function \"\(functionName)\" with parameters: \(parameters)")
 
         let (results, invokeTime) = try measure(if: isVerbose) {
             try runtime.invoke(moduleInstance, function: functionName, with: parameters)
         }
 
-        logger.infoMessage("Ended invoking function \"\(functionName)\": \(invokeTime)")
+        logger.info("Ended invoking function \"\(functionName)\": \(invokeTime)")
 
         stdout <<< results.description
     }