Merge pull request #62 from rockbruno/fix-pr

Fix danger-swiftinfo + Xcode 12.3
rockbruno · Feb 6, 2021 · 94ecd1a · 94ecd1a
2 parents 8cfd1ff + cc211f5
commit 94ecd1a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,12 +16,12 @@ jobs:
     - name: Build
       run: make build
       env:
-        DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
     - name: Run tests
       run: swift test
     - name: Check the example project
       run: cd ./ExampleProject && make swiftinfo
       env:
-        DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
     - name: Package
       run: make package
diff --git a/ExampleProject/Infofile.swift b/ExampleProject/Infofile.swift
@@ -20,6 +20,8 @@ api.print(output: output)
 
 if ProcessInfo.processInfo.arguments.contains("--myCustomArgument") {
     print("Yay, custom arguments!")
+} else {
+    preconditionFailure("The custom arguments test didn't work.")
 }
 
 api.save(output: output)
diff --git a/Sources/SwiftInfo/main.swift b/Sources/SwiftInfo/main.swift
@@ -33,7 +33,7 @@ struct Swiftinfo: ParsableCommand {
             Swiftinfo.exit()
         }
 
-        setupLogConfig()
+        setupConfig()
 
         let fileUtils = FileUtils()
         let toolchainPath = getToolchainPath()
@@ -78,10 +78,11 @@ struct Swiftinfo: ParsableCommand {
         return oneLined + "/Toolchains/XcodeDefault.xctoolchain/usr/lib/sourcekitd.framework/sourcekitd"
     }
 
-    private func setupLogConfig() {
+    private func setupConfig() {
         isInVerboseMode = verbose
         isInSilentMode = silent
         printSourceKitQueries = printSourcekit
+        isInPullRequestMode = ProcessInfo.processInfo.arguments.contains("--pullRequest")
     }
 }