fix: combine validator and beacon branches, no dups

Author: barnabasbusa

branches.yaml

@@ -18,7 +18,7 @@ erigon:
     - fusaka-devnet-2
     - fusaka-devnet-3
     - performance-modexp
-    
+
 ethereumjs:
   branches:
     - master
@@ -32,7 +32,7 @@ geth:
     - fusaka-devnet-2
     - fusaka-devnet-3
     - performance-modexp
-    
+
   alt_repos:
     gballet/go-ethereum:
       - kaustinen-with-shapella
@@ -72,48 +72,30 @@ lodestar:
     - fusaka-devnet-2
     - fusaka-devnet-3
     - fusaka-devnet-4
-    
+
 nethermind:
   branches:
     - master
     - fusaka-devnet-2
     - performance
     - fusaka-devnet-3
     - performance-modexp
-    
-nimbus-eth2:
+
+nimbus:
   branches:
     - unstable
     - stable
     - column-syncer
     - fusaka-devnet-3
     - fusaka-devnet-2
-    
-nimbus-validator-client:
-  # Uses same repo as nimbus-eth2
-  branches:
-    - unstable
-    - stable
-    - fusaka-devnet-2
-    - fusaka-devnet-3
-    
-nimbus-eth1:
-  branches:
-    - master
-    - fusaka-devnet-2
-    - fusaka-devnet-3
 
-prysm-beacon-chain:
+nimbus-eth1:
   branches:
-    - develop
     - master
-    - peerDAS
     - fusaka-devnet-2
     - fusaka-devnet-3
-    - fusaka-devnet-3-bpo
 
-prysm-validator:
-  # Uses same repo as prysm-beacon-chain
+prysm:
   branches:
     - develop
     - master
@@ -193,9 +175,10 @@ mev-boost-relay:
   alt_repos:
     bharath-123/mev-boost-relay:
       - fusaka-devnet-3
-ethrex:
-  branches:
-    - main
+
+# ethrex:
+#   branches:
+#     - main
 
 eth-das-guardian:
   branches:

generate_config.py

@@ -71,6 +71,23 @@ def generate_config():
     with open('branches.yaml', 'r') as f:
         branches_config = yaml.safe_load(f)
 
+    # Expand combined client definitions
+    expanded_config = {}
+    for client_name, client_config in branches_config.items():
+        if client_name == 'prysm':
+            # Expand prysm into both beacon and validator
+            expanded_config['prysm-beacon-chain'] = client_config
+            expanded_config['prysm-validator'] = client_config
+        elif client_name == 'nimbus':
+            # Expand nimbus into both eth2 and validator
+            expanded_config['nimbus-eth2'] = client_config
+            expanded_config['nimbus-validator-client'] = client_config
+        else:
+            # Keep as-is
+            expanded_config[client_name] = client_config
+    
+    branches_config = expanded_config
+
     # Output configuration list
     config_list = []