Merge pull request #11 from WideSpectrumComputing/master

chore: ref #9
rollbar · Nov 25, 2020 · 5568885 · 5568885
2 parents 7f7a719 + 5a444c8
commit 5568885
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 31 deletions.
diff --git a/.github/workflows/masterCI.yml b/.github/workflows/masterCI.yml
@@ -13,7 +13,31 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Build
+
+    - name: Build RollbarCommon
+      working-directory: RollbarCommon
       run: swift build -v
-    - name: Run tests
+    - name: Unit Test RollbarCommon
+      working-directory: RollbarCommon
+      run: swift test -v
+
+    - name: Build RollbarDeploys
+      working-directory: RollbarDeploys
+      run: swift build -v
+    - name: Unit Test RollbarDeploys
+      working-directory: RollbarDeploys
+      run: swift test -v
+
+    - name: Build RollbarNotifier
+      working-directory: RollbarNotifier
+      run: swift build -v
+    - name: Unit Test RollbarNotifier
+      working-directory: RollbarNotifier
+      run: swift test -v
+
+    - name: Build RollbarKSCrash
+      working-directory: RollbarKSCrash
+      run: swift build -v
+    - name: Unit Test RollbarKSCrash
+      working-directory: RollbarKSCrash
       run: swift test -v
diff --git a/Package.swift b/Package.swift
@@ -17,9 +17,9 @@ let package = Package(
         .library(
             name: "RollbarCommon",
             targets: ["RollbarCommon"]),
-        // .library(
-        //     name: "RollbarDeploys",
-        //     targets: ["RollbarDeploys"]),
+        .library(
+            name: "RollbarDeploys",
+            targets: ["RollbarDeploys"]),
         // .library(
         //     name: "RollbarNotifier",
         //     targets: ["RollbarNotifier"]),
@@ -60,32 +60,31 @@ let package = Package(
            ]
        ),
 
-
-        // .target(
-        //     name: "RollbarDeploys",
-        //     dependencies: ["RollbarCommon",],
-        //     path: "RollbarDeploys/Sources/RollbarDeploys",
-        //     publicHeadersPath: "include",
-        //     cSettings: [
-        //         .headerSearchPath("RollbarDeploys/Sources/RollbarDeploys/**"),
-        //     ]
-        // ),
-        // .testTarget(
-        //     name: "RollbarDeploysTests",
-        //     dependencies: ["RollbarDeploys"],
-        //     path: "RollbarDeploys/Sources/RollbarDeploysTests",
-        //     cSettings: [
-        //         .headerSearchPath("RollbarDeploys/Tests/RollbarDeploysTests/**"),
-        //     ]
-        // ),
-        // .testTarget(
-        //     name: "RollbarDeploysTests-ObjC",
-        //     dependencies: ["RollbarDeploys"],
-        //     path: "RollbarDeploys/Sources/RollbarDeploysTests-ObjC",
-        //     cSettings: [
-        //         .headerSearchPath("RollbarDeploys/Tests/RollbarDeploysTests-ObjC/**"),
-        //     ]
-        // ),
+        .target(
+            name: "RollbarDeploys",
+            dependencies: ["RollbarCommon",],
+            path: "RollbarDeploys/Sources/RollbarDeploys",
+            publicHeadersPath: "include",
+            cSettings: [
+                .headerSearchPath("RollbarDeploys/Sources/RollbarDeploys/**"),
+            ]
+        ),
+        .testTarget(
+            name: "RollbarDeploysTests",
+            dependencies: ["RollbarDeploys"],
+            path: "RollbarDeploys/Tests/RollbarDeploysTests",
+            cSettings: [
+                .headerSearchPath("RollbarDeploys/Tests/RollbarDeploysTests/**"),
+            ]
+        ),
+        .testTarget(
+            name: "RollbarDeploysTests-ObjC",
+            dependencies: ["RollbarDeploys"],
+            path: "RollbarDeploys/Tests/RollbarDeploysTests-ObjC",
+            cSettings: [
+                .headerSearchPath("RollbarDeploys/Tests/RollbarDeploysTests-ObjC/**"),
+            ]
+        ),
 
 
         // .target(