Skip to content

Commit cc343ce

Browse files
Revert "fix: pass on target depends itself (#138)" (#150)
This reverts commit 68e99f1.
1 parent 34849a0 commit cc343ce

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

cli/src/main/kotlin/com/bazel_diff/hash/RuleHasher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class RuleHasher : KoinComponent {
5050
inputRule == null && sourceDigests.containsKey(ruleInput) -> {
5151
safePutBytes(sourceDigests[ruleInput])
5252
}
53-
inputRule?.name != null -> {
53+
inputRule?.name != null && inputRule.name != rule.name -> {
5454
val ruleInputHash = digest(
5555
inputRule,
5656
allRulesMap,

cli/src/test/kotlin/com/bazel_diff/hash/BuildGraphHasherTest.kt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,25 @@ class BuildGraphHasherTest : KoinTest {
114114
)
115115
}
116116

117+
@Test
118+
fun testCyclicRuleInput() = runBlocking {
119+
val ruleInputs = listOf("rule1", "rule4")
120+
val rule3 = createRuleTarget("rule3", ruleInputs, "digest")
121+
val rule4 = createRuleTarget("rule4", ruleInputs, "digest2")
122+
defaultTargets.add(rule3)
123+
defaultTargets.add(rule4)
124+
125+
whenever(bazelClientMock.queryAllTargets()).thenReturn(defaultTargets)
126+
whenever(bazelClientMock.queryAllSourcefileTargets()).thenReturn(emptyList())
127+
val hash = hasher.hashAllBazelTargetsAndSourcefiles()
128+
assertThat(hash).containsOnly(
129+
"rule1" to "2c963f7c06bc1cead7e3b4759e1472383d4469fc3238dc42f8848190887b4775",
130+
"rule2" to "bdc1abd0a07103cea34199a9c0d1020619136ff90fb88dcc3a8f873c811c1fe9",
131+
"rule3" to "ca2f970a5a5a18730d7633cc32b48b1d94679f4ccaea56c4924e1f9913bd9cb5",
132+
"rule4" to "bf15e616e870aaacb02493ea0b8e90c6c750c266fa26375e22b30b78954ee523",
133+
)
134+
}
135+
117136
@Test
118137
fun testCircularDependency() = runBlocking {
119138
val rule3 = createRuleTarget("rule3", listOf("rule2", "rule4"), "digest3")

0 commit comments

Comments
 (0)