Browse Source

Merge pull request #1418 from AppFlowy-IO/ci/fix_build

ci: fix typo
Nathan.fooo 2 years ago
parent
commit
992be378bb

+ 1 - 1
frontend/rust-lib/flowy-database/src/macros.rs

@@ -1,6 +1,6 @@
 #[rustfmt::skip]
 /*
-diesel master support on_conflict on rev_sqlite but not 1.4.7 version. Workaround for this
+diesel master support on_conflict on sqlite but not 1.4.7 version. Workaround for this
 
 match dsl::workspace_table
     .filter(workspace_table::id.eq(table.id.clone()))

+ 1 - 1
frontend/rust-lib/flowy-document/src/manager.rs

@@ -197,7 +197,7 @@ impl DocumentManager {
     /// # Arguments
     ///
     /// * `doc_id`: the id of the document
-    /// * `pool`: rev_sqlite connection pool
+    /// * `pool`: sqlite connection pool
     ///
     /// returns: Result<Arc<DocumentEditor>, FlowyError>
     ///

+ 1 - 1
frontend/scripts/docker-buildfiles/Dockerfile

@@ -17,7 +17,7 @@ RUN git clone https://aur.archlinux.org/yay.git \
   && cd yay \
   && makepkg -sri --needed --noconfirm
 
-RUN yay -S --noconfirm curl base-devel rev_sqlite openssl clang cmake ninja pkg-config gtk3 unzip
+RUN yay -S --noconfirm curl base-devel sqlite openssl clang cmake ninja pkg-config gtk3 unzip
 RUN xdg-user-dirs-update
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN source $HOME/.cargo/env && rustup toolchain install stable && rustup default stable

+ 2 - 2
frontend/scripts/flowy-tool/src/proto/proto_info.rs

@@ -19,7 +19,7 @@ impl CrateProtoInfo {
     pub fn create_crate_mod_file(&self) {
         // mod model;
         // pub use model::*;
-        let mod_file_path = format!("{}/rev_sqlite", self.inner.protobuf_crate_name());
+        let mod_file_path = format!("{}/mod.rs", self.inner.protobuf_crate_name());
         let mut content = "#![cfg_attr(rustfmt, rustfmt::skip)]\n".to_owned();
         content.push_str("// Auto-generated, do not edit\n");
         content.push_str("mod model;\npub use model::*;");
@@ -84,7 +84,7 @@ impl ProtobufCrate {
     }
 
     pub fn proto_model_mod_file(&self) -> String {
-        format!("{}/rev_sqlite", self.proto_struct_output_dir())
+        format!("{}/mod.rs", self.proto_struct_output_dir())
     }
 }