Browse Source

Merge pull request #14 from stephengroat/patch-1

Use brewfile
AppFlowy.IO 3 năm trước cách đây
mục cha
commit
796a0a9f41
3 tập tin đã thay đổi với 7 bổ sung8 xóa
  1. 3 0
      Brewfile
  2. 4 5
      Makefile
  3. 0 3
      scripts/makefile/env.toml

+ 3 - 0
Brewfile

@@ -0,0 +1,3 @@
+brew 'protobuf'
+brew 'sqlite3'
+brew 'rustup-init'

+ 4 - 5
Makefile

@@ -3,11 +3,10 @@
 flowy_dev: install_cargo_make
 	cargo make flowy_dev
 
-install_cargo_make: 
+install_cargo_make:
 	cargo install --force cargo-make
+	brew bundle
 
 install_rust:
-	sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
-	curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
-	echo 'export PATH="$$HOME/.cargo/bin:$$PATH"' >> ~/.bash_profile
-	source ~/.bash_profile
+	brew bundle
+	rustup-init -y

+ 0 - 3
scripts/makefile/env.toml

@@ -3,7 +3,6 @@ run_task = { name = ["install_targets","install_diesel", "install_protobuf"] }
 
 [tasks.install_diesel]
 script = """
-brew install sqlite3
 cargo install diesel_cli --no-default-features --features sqlite
 """
 
@@ -17,8 +16,6 @@ rustup target add aarch64-apple-darwin
 
 [tasks.install_protobuf]
 script = """
-brew install [email protected]
-
 # Custom dart:
 #brew tap dart-lang/dart
 #brew install dart