Revert "stop testing with broken upstream/version-2-0" (#6573)

* Revert "stop testing with broken upstream/version-2-0 (#6554)"

This reverts commit 205dff33781c05a9a342b2d8629d0d205ce07532.

* stop using template which Nim 2.0.10 will apparently make recursive

.github/workflows/ci.yml

@@ -35,8 +35,18 @@ jobs:
             cpu: amd64
           - os: windows
             cpu: amd64
-        branch: [~]
+        branch: [~, upstream/version-2-0]
+        exclude:
+          - target:
+              os: macos
+            branch: upstream/version-2-0
+          - target:
+              os: windows
+            branch: upstream/version-2-0
         include:
+          - branch: upstream/version-2-0
+            branch-short: version-2-0
+            nimflags-extra: --mm:refc
           - target:
               os: linux
             builder: ['self-hosted','ubuntu-22.04']

ncli/ncli_db.nim

@@ -777,8 +777,7 @@ proc cmdValidatorPerf(conf: DbConf, cfg: RuntimeConfig) =
       indices
     case info.kind
     of EpochInfoFork.Phase0:
-      template info: untyped = info.phase0Data
-      for i, s in info.validators:
+      for i, s in info.phase0Data.validators:
         let perf = addr perfs[i]
         if RewardFlags.isActiveInPreviousEpoch in s.flags:
           if s.is_previous_epoch_attester.isSome():