Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
ci: fix typo
This commit is contained in:
Nathan.fooo 2022-11-07 15:54:33 +08:00 committed by GitHub
commit 992be378bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/rust-lib/flowy-database/src/macros.rs
View File

@ -1,6 +1,6 @@
#[rustfmt::skip] #[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 match dsl::workspace_table
.filter(workspace_table::id.eq(table.id.clone())) .filter(workspace_table::id.eq(table.id.clone()))

2
frontend/rust-lib/flowy-document/src/manager.rs
View File

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

2
frontend/scripts/docker-buildfiles/Dockerfile
View File

@ -17,7 +17,7 @@ RUN git clone https://aur.archlinux.org/yay.git \
&& cd yay \ && cd yay \
&& makepkg -sri --needed --noconfirm && 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 xdg-user-dirs-update
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 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 RUN source $HOME/.cargo/env && rustup toolchain install stable && rustup default stable

4
frontend/scripts/flowy-tool/src/proto/proto_info.rs
View File

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