From 5b5010835dc3e4dd80297aa665a68c2a8b4d4c97 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Mon, 9 Dec 2024 08:27:58 -0400
Subject: [PATCH] fix(ci): use nim 2.0 branch

---
 .github/workflows/ci.yml          | 5 +----
 .github/workflows/daily_amd64.yml | 2 +-
 .github/workflows/daily_i386.yml  | 2 +-
 .github/workflows/daily_sat.yml   | 2 +-
 libp2p.nimble                     | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb71b236b0..decaaabbe9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,10 +32,7 @@ jobs:
         nim:
           - ref: version-1-6
             memory_management: refc
-          # The ref below corresponds to the branch "version-2-0".
-          # Right before an update from Nimble 0.16.1 to 0.16.2.
-          # That update breaks our dependency resolution.
-          - ref: 8754469f4947844c5938f56e1fba846c349354b5
+          - ref: version-2-0
             memory_management: refc
         include:
           - platform:
diff --git a/.github/workflows/daily_amd64.yml b/.github/workflows/daily_amd64.yml
index 7e2e76570a..7512f11e9c 100644
--- a/.github/workflows/daily_amd64.yml
+++ b/.github/workflows/daily_amd64.yml
@@ -10,5 +10,5 @@ jobs:
     name: Daily amd64
     uses: ./.github/workflows/daily_common.yml
     with:
-      nim: "[{'ref': 'version-1-6', 'memory_management': 'refc'}, {'ref': '8754469f4947844c5938f56e1fba846c349354b5', 'memory_management': 'refc'}]"
+      nim: "[{'ref': 'version-1-6', 'memory_management': 'refc'}, {'ref': 'version-2-0', 'memory_management': 'refc'}]"
       cpu: "['amd64']"
diff --git a/.github/workflows/daily_i386.yml b/.github/workflows/daily_i386.yml
index f6adf490b0..15339de60c 100644
--- a/.github/workflows/daily_i386.yml
+++ b/.github/workflows/daily_i386.yml
@@ -10,6 +10,6 @@ jobs:
     name: Daily i386 (Linux)
     uses: ./.github/workflows/daily_common.yml
     with:
-      nim: "[{'ref': 'version-1-6', 'memory_management': 'refc'}, {'ref': '8754469f4947844c5938f56e1fba846c349354b5', 'memory_management': 'refc'}, {'ref': 'devel', 'memory_management': 'orc'}]"
+      nim: "[{'ref': 'version-1-6', 'memory_management': 'refc'}, {'ref': 'version-2-0', 'memory_management': 'refc'}, {'ref': 'devel', 'memory_management': 'orc'}]"
       cpu: "['i386']"
       exclude: "[{'platform': {'os':'macos'}}, {'platform': {'os':'windows'}}]"
diff --git a/.github/workflows/daily_sat.yml b/.github/workflows/daily_sat.yml
index a3bcc14a53..5f9876acdf 100644
--- a/.github/workflows/daily_sat.yml
+++ b/.github/workflows/daily_sat.yml
@@ -10,6 +10,6 @@ jobs:
     name: Daily SAT
     uses: ./.github/workflows/daily_common.yml
     with:
-      nim: "[{'ref': '8754469f4947844c5938f56e1fba846c349354b5', 'memory_management': 'refc'}]"
+      nim: "[{'ref': 'version-2-0', 'memory_management': 'refc'}]"
       cpu: "['amd64']"
       use_sat_solver: true
diff --git a/libp2p.nimble b/libp2p.nimble
index a8ee7a84fc..36efca7cec 100644
--- a/libp2p.nimble
+++ b/libp2p.nimble
@@ -126,8 +126,8 @@ task examples_build, "Build the samples":
   buildSample("tutorial_4_gossipsub", true)
   buildSample("tutorial_5_discovery", true)
   exec "nimble install -y nimpng@#HEAD"
-    # this is to fix broken build on 1.7.3, remove it when nimpng version 0.3.2 or later is released
-  exec "nimble install -y nico@#af99dd60bf2b395038ece815ea1012330a80d6e6"
+  # this is to fix broken build on 1.7.3, remove it when nimpng version 0.3.2 or later is released
+  exec "nimble install -y nico@#af99dd60bf2b395038ece815ea1012330a80d6e6 --passNim=--skipParentCfg"
   buildSample("tutorial_6_game", false, "--styleCheck:off")
 
 # pin system