clone sat

.github/workflows/ci.yml

@@ -131,6 +131,7 @@ jobs:
       - name: Run tests
         run: |
           cd atlas
+          nim cloneDeps
           nim c -r tests/tester.nim
 
       - name: Test install with Nimble

config.nims

@@ -8,7 +8,11 @@ task unitTests, "Runs unit tests":
 task tester, "Runs integration tests":
   exec "nim c -d:debug -r tests/tester.nim"
 
+task cloneDeps, "clone Atlas deps":
+  exec "nim r src/private/clone.nim"
+
 task buildRelease, "Build release":
+  exec "nim r src/private/clone.nim"
   when defined(macosx):
     let x86Args = "\"-target x86_64-apple-macos11 -arch x86_64 -DARCH=x86_64\""
     exec "nim c -d:release --passC:" & x86args & " --passL:" & x86args & " -o:./atlas_x86_64 src/atlas.nim"

src/atlas.nim

@@ -10,12 +10,14 @@
 ## a Nimble dependency and its dependencies recursively.
 
 import std / [parseopt, strutils, os, osproc, tables, sets, json, jsonutils]
-import versions, context, osutils, packagesjson, sat, gitops, nimenv, lockfiles,
+import versions, context, osutils, packagesjson, gitops, nimenv, lockfiles,
   depgraphs, confighandler, configutils, cloner, nimblechecksums, reporters,
   nimbleparser, pkgurls
 
 from std/terminal import isatty
 
+import ../dist/sat/src/sat/sat
+
 const
   AtlasVersion =
     block:

src/depgraphs.nim

@@ -8,7 +8,10 @@
 
 import std / [sets, tables, os, strutils, streams, json, jsonutils, algorithm]
 
-import context, satvars, sat, gitops, runners, reporters, nimbleparser, pkgurls, cloner, versions
+import context, gitops, runners, reporters, nimbleparser, pkgurls, cloner, versions
+
+import ../dist/sat/src/sat/[sat, satvars]
+
 
 type
   DependencyVersion* = object  # Represents a specific version of a project.

src/nimbleparser.nim

@@ -7,7 +7,9 @@
 #
 
 import std / [os, strutils, tables, unicode, hashes]
-import versions, satvars, packagesjson, reporters, gitops, parse_requires, pkgurls, compiledpatterns
+import versions, packagesjson, reporters, gitops, parse_requires, pkgurls, compiledpatterns
+
+import ../dist/sat/src/sat/satvars
 
 type
   DependencyStatus* = enum