fix(ci): use nim 2.0 branch (#1228)

vacp2p · Dec 9, 2024 · fd26f93 · fd26f93
1 parent dd2c74d
commit fd26f93
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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