Merge pull request #687 from uber/edwin.revert

Revert "Fix entries in build.yaml being order dependent"
uber · Mar 4, 2020 · cb342ff · cb342ff
2 parents f4996c7 + 95925e2
commit cb342ff
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/codegen/module.go b/codegen/module.go
@@ -641,21 +641,21 @@ func (system *ModuleSystem) ResolveModules(
 					)
 				}
 			}
-		}
 
-		// Resolve dependencies for all classes
-		resolveErr := system.populateResolvedDependencies(
-			resolvedModules[className],
-			resolvedModules,
-		)
-		if resolveErr != nil {
-			return nil, resolveErr
-		}
+			// Resolve dependencies for all classes
+			resolveErr := system.populateResolvedDependencies(
+				resolvedModules[className],
+				resolvedModules,
+			)
+			if resolveErr != nil {
+				return nil, resolveErr
+			}
 
-		// Resolved recursive dependencies for all classes
-		recursiveErr := system.populateRecursiveDependencies(resolvedModules[className])
-		if recursiveErr != nil {
-			return nil, recursiveErr
+			// Resolved recursive dependencies for all classes
+			recursiveErr := system.populateRecursiveDependencies(resolvedModules[className])
+			if recursiveErr != nil {
+				return nil, recursiveErr
+			}
 		}
 	}