Skip to content

Commit d2dcccf

Browse files
authoredJan 15, 2021
Merge pull request #153 from danger/pass_danger_js_path
2 parents 2a4b27e + da83ebb commit d2dcccf

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed
 

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- Migrate from moshi to kotlinx serialization [@gianluz] - [#141](https://github.com/danger/kotlin/pull/141)
1616
- Fix incorrect url in install.sh script and in Dockerfile [@davidbilik] - [#144](https://github.com/danger/kotlin/pull/144)
1717
- Road to 1.0 - Refactor project structure [@gianluz] - [#142](https://github.com/danger/kotlin/pull/142)
18+
- Handle danger-js custom paths with parameter `--danger-js-path` [@f-meloni] - [#153](https://github.com/danger/kotlin/pull/153)
1819
- Update Kotlin to 1.4.20 [@gianluz] - [#148](https://github.com/danger/kotlin/pull/148)
1920
- Fix gitlab defaults following kotlinx serialisation [@gianluz] - [#146](https://github.com/danger/kotlin/pull/146)
2021
- Road to 1.0 - Migrate from java.util.Date to kotlinx.datetime [@gianluz] - [#147](https://github.com/danger/kotlin/pull/147)

‎danger-kotlin/src/runnerMain/kotlin/systems.danger/cmd/dangerjs/DangerJS.kt

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ import systems.danger.Log
44
import systems.danger.cmd.Cmd
55

66
object DangerJS: DangerJSBridge {
7-
87
override fun process(command: String, processName: String, args: List<String>) {
98
Log.info("Launching Danger-JS", verbose = true)
109
with(Cmd()) {
11-
name("$(which danger) $command --process $processName --passURLForDSL")
10+
val dangerJSArgumentIndex = args.indexOf("--danger-js-path")
11+
val dangerJSPath: String
12+
if (dangerJSArgumentIndex != -1 && args.count() > dangerJSArgumentIndex + 1) {
13+
dangerJSPath = args[dangerJSArgumentIndex + 1]
14+
} else {
15+
dangerJSPath = "$(which danger)"
16+
}
17+
name("$dangerJSPath $command --process $processName --passURLForDSL")
1218
args(args.joinToString(" "))
1319
exec()
1420
}

0 commit comments

Comments
 (0)