From 9a3b1f7ab90eeeaf043c37433b55358bbf16ebc8 Mon Sep 17 00:00:00 2001 From: tersec Date: Sat, 21 Sep 2024 03:03:40 +0000 Subject: [PATCH 1/2] Revert "stop testing with broken upstream/version-2-0 (#6554)" This reverts commit 205dff33781c05a9a342b2d8629d0d205ce07532. --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3db4bac790..bb30253790 100644 --- a/.github/workflows/ci.yml +++ b/.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'] From b7f3f0c2e8f58686393f15d063f17dcf4a19d4f2 Mon Sep 17 00:00:00 2001 From: tersec Date: Sat, 21 Sep 2024 12:50:33 +0000 Subject: [PATCH 2/2] stop using template which Nim 2.0.10 will apparently make recursive --- ncli/ncli_db.nim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ncli/ncli_db.nim b/ncli/ncli_db.nim index 3129e31e13..2e5f812dae 100644 --- a/ncli/ncli_db.nim +++ b/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():