ci: make sure targets are built before building docs

wireapp · Nov 21, 2024 · 8e23bf4 · 8e23bf4
1 parent 1d40b8a
commit 8e23bf4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -28,7 +28,9 @@ jobs:
     - uses: actions-rust-lang/setup-rust-toolchain@v1  # this implicitly caches Rust tools and build artifacts
       with:
         rustflags: ''
-        target: wasm32-unknown-unknown
+        target: |
+          wasm32-unknown-unknown
+          x86_64-unknown-linux-gnu
 
     - name: Setup cargo-make
       uses: davidB/rust-cargo-make@v1
@@ -49,7 +51,6 @@ jobs:
     - name: Build TypeScript and Kotlin docs
       run: |
         cd crypto-ffi
-        cargo make wasm-build
         cargo make docs-ts
         cargo make docs-kotlin
 

diff --git a/crypto-ffi/Makefile.toml b/crypto-ffi/Makefile.toml
@@ -62,7 +62,11 @@ script = '''
 '''
 
 [tasks.docs-kotlin]
-dependencies = ["docs-kotlin-install-deps"]
+dependencies = [
+    "docs-kotlin-install-deps",
+    { name = "jvm-darwin", condition = { platforms = ["mac"] } },
+    { name = "jvm-linux", condition = { platforms = ["linux"] } }
+]
 command = "java"
 args = [
     "-jar", "../target/_kotlin_docs_tmp/dokka-cli-${DOKKA_VERSION}.jar",
@@ -112,11 +116,9 @@ args = [
 script = "cargo make wasm-build --dev"
 
 [tasks.wasm]
-dependencies = ["wasm-build"]
-script = [
-    "bun install",
-    "bun run build_ts.ts"
-]
+dependencies = ["wasm-build", "bun-deps"]
+command = "bun"
+args = ["run", "build_ts.ts"]
 
 ##################################### FFI #####################################