Browse Source

Merge pull request #22 from pdckxd/main

Fix task dependency order problem. Extract step of "vcpkg install sql…
AppFlowy.IO 3 years ago
parent
commit
5a1e059a78
1 changed files with 6 additions and 2 deletions
  1. 6 2
      scripts/makefile/env.toml

+ 6 - 2
scripts/makefile/env.toml

@@ -2,7 +2,7 @@
 run_task = { name = ["install_prerequests","install_diesel", "install_protobuf"] }
 
 [tasks.install_windows_deps.windows]
-dependencies=["check_duckscript_installation", "check_visual_studio_installation", "check_vcpkg", "install_rust_vcpkg_cli"]
+dependencies=["check_duckscript_installation", "check_visual_studio_installation", "check_vcpkg", "install_vcpkg_sqlite", "install_rust_vcpkg_cli"]
 
 [tasks.check_visual_studio_installation.windows]
 script = """
@@ -36,6 +36,11 @@ end
 """
 script_runner = "@duckscript"
 
+[tasks.install_vcpkg_sqlite.windows]
+script = """
+vcpkg install sqlite3:x64-windows-static-md
+"""
+
 [tasks.install_rust_vcpkg_cli.windows]
 script = """
 exec cargo install vcpkg_cli
@@ -54,7 +59,6 @@ cargo install diesel_cli --no-default-features --features sqlite
 
 [tasks.install_diesel.windows]
 script = """
-vcpkg install sqlite3:x64-windows-static-md
 cargo install diesel_cli --no-default-features --features sqlite
 """
 dependencies = ["check_vcpkg"]