Merge branch 'main' into LNG-123-scopes

fluencelabs · Jul 14, 2023 · 682b480 · 682b480
2 parents 264d580 + 33ab33d
commit 682b480
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -43,21 +43,6 @@ jobs:
       - name: scala-js build
         run: sbt ";cliJS/fullLinkJS;language-server-apiJS/fullLinkJS;aqua-apiJS/fullLinkJS"
 
-
-  aqua-cli:
-    name: "Publish aqua-cli"
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-
-    needs:
-      - compile
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.tag }}
-
       - name: Import secrets
         uses: hashicorp/vault-action@v2.7.0
         with:

diff --git a/linker/src/main/scala/aqua/linker/Linker.scala b/linker/src/main/scala/aqua/linker/Linker.scala
@@ -40,12 +40,10 @@ object Linker extends Logging {
       case path :: otherPaths =>
         val pathDeps = deps.get(path.last).toList.flatten
         val cycles = pathDeps.flatMap(dep =>
-          NonEmptyChain
-            .fromChain(
-              // This is slow
-              path.toChain.dropWhile(_ != dep)
-            )
-            .toList
+          NonEmptyChain.fromChain(
+            // This is slow
+            path.toChain.dropWhile(_ != dep)
+          )
         )
         val newPaths = pathDeps
           .filterNot(visited.contains)
@@ -62,7 +60,7 @@ object Linker extends Logging {
       .flatMap(m =>
         findCycles(
           paths = NonEmptyChain.one(m.id) :: Nil,
-          visited = Set.empty,
+          visited = Set(m.id),
           result = List.empty
         )
       )