ci fixes

Author: Rutik7066

.github/workflows/ci.yaml

@@ -137,7 +137,7 @@ jobs:
       - name: Build and test Ollama integration
         run: |
           set -e
-          cargo make --cwd llm build-ollama
+          cargo make build
           cd test
           golem-cli app build -b ollama-debug
           golem-cli app deploy -b ollama-debug

Makefile.toml

@@ -6,14 +6,20 @@ skip_core_tasks = true
 command = "cargo"
 args = ["clean"]
 
+[tasks.clean-all]
+script_runner = "@duckscript"
+script = '''
+exec find . -type d \( -name "target" -o -name "wit-generated" -o -name "golem-temp" \) -exec rm -rf {} +
+'''
+
 [tasks.unit-tests]
 command = "cargo"
 args = ["test"]
 
 [tasks.build]
 script_runner = "@duckscript"
 script = '''
-domains = array llm
+domains = array llm embed
 
 # if there is no domain passed run for every domain
 if is_empty ${1}
@@ -28,7 +34,7 @@ end
 [tasks.release-build]
 script_runner = "@duckscript"
 script = '''
-domains = array llm
+domains = array llm embed
 
 # if there is no domain passed run for every domain
 if is_empty ${1}
@@ -44,7 +50,7 @@ end
 script_runner = "@duckscript"
 script = '''
 #!/bin/bash
-domains = array llm
+domains = array llm embed
 
 # if there is no domain passed run for every domain
 if is_empty ${1}
@@ -60,7 +66,7 @@ end
 script_runner = "@duckscript"
 script = '''
 #!/bin/bash
-domains = array llm
+domains = array llm embed
 
 # if there is no domain passed run for every domain
 if is_empty ${1}
@@ -75,7 +81,7 @@ end
 [tasks.wit]
 script_runner = "@duckscript"
 script = '''
-domains = array llm
+domains = array llm embed
 
 # if there is no domain passed run for every domain
 if is_empty ${1}
@@ -91,7 +97,7 @@ end
 description = "Builds all test components with golem-cli"
 script_runner = "@duckscript"
 script = '''
-domains = array llm
+domains = array llm embed
 
 # if there is no domain passed run for every domain
 if is_empty ${1}

test/Cargo.lock

@@ -36,8 +36,8 @@ path = "wit-generated"
 
 [package.metadata.component.target.dependencies]
 "golem:embed" = { path = "wit-generated/deps/golem-embed" }
-"wasi:io" = { path = "wit-generated/deps/io" }
 "wasi:clocks" = { path = "wit-generated/deps/clocks" }
+"wasi:io" = { path = "wit-generated/deps/io" }
 "golem:rpc" = { path = "wit-generated/deps/golem-rpc" }
 "test:helper-client" = { path = "wit-generated/deps/test_helper-client" }
 "test:embed-exports" = { path = "wit-generated/deps/test_embed-exports" }

test/components-rust/test-embed/Cargo.toml

@@ -6,7 +6,7 @@
 # See https://learn.golem.cloud/docs/app-manifest#field-reference for field reference
 
 components:
-  test:embed:
+  test:embed: 
     profiles:
       # DEBUG PROFILES
       openai-debug:
@@ -22,10 +22,10 @@ components:
               - ../../common-rust
             targets:
               - target/wasm32-wasip1/debug/test_embed.wasm
-          - command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_openai_plugged.wasm
+          - command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_openai_plugged.wasm
             sources:
               - ../../target/wasm32-wasip1/debug/test_embed.wasm
-              - ../../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm
+              - ../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm
             targets:
               - ../../target/wasm32-wasip1/debug/test_openai_plugged.wasm
         sourceWit: wit
@@ -48,10 +48,10 @@ components:
               - ../../common-rust
             targets:
               - target/wasm32-wasip1/debug/test_embed.wasm
-          - command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_cohere_plugged.wasm
+          - command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_cohere_plugged.wasm
             sources:
               - ../../target/wasm32-wasip1/debug/test_embed.wasm
-              - ../../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm
+              - ../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm
             targets:
               - ../../target/wasm32-wasip1/debug/test_cohere_plugged.wasm
         sourceWit: wit
@@ -74,10 +74,10 @@ components:
               - ../../common-rust
             targets:
               - target/wasm32-wasip1/debug/test_embed.wasm
-          - command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_hugging_face_plugged.wasm
+          - command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_hugging_face_plugged.wasm
             sources:
               - ../../target/wasm32-wasip1/debug/test_embed.wasm
-              - ../../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm
+              - ../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm
             targets:
               - ../../target/wasm32-wasip1/debug/test_hugging_face_plugged.wasm
         sourceWit: wit
@@ -100,10 +100,10 @@ components:
               - ../../common-rust
             targets:
               - target/wasm32-wasip1/debug/test_embed.wasm
-          - command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_voyageai_plugged.wasm
+          - command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_voyageai_plugged.wasm
             sources:
               - ../../target/wasm32-wasip1/debug/test_embed.wasm
-              - ../../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm
+              - ../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm
             targets:
               - ../../target/wasm32-wasip1/debug/test_voyageai_plugged.wasm
         sourceWit: wit