Page MenuHomePhabricator
Files F3378528

D11115.id37353.diff
No OneTemporary
Actions

D11115.id37353.diff
View Options

diff --git a/.buildkite/emscripten.yml b/.buildkite/emscripten.yml
--- a/.buildkite/emscripten.yml
+++ b/.buildkite/emscripten.yml
@@ -1,12 +1,22 @@
steps:
- - label: 'Emscripten build'
+ - label: 'Emscripten and Wasmpack build'
command:
+ - 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
+ - 'source /root/.cargo/env'
+ - 'cargo install wasm-pack'
- 'apt update && apt install -y autoconf libtool build-essential cmake git'
- 'cd web'
+ # Emscripten
- 'BEFORE_HASH=$(sha256sum ./database/_generated/comm_query_executor.wasm)'
- './scripts/run_emscripten.sh'
- 'AFTER_HASH=$(sha256sum ./database/_generated/comm_query_executor.wasm)'
- '[[ "$BEFORE_HASH" == "$AFTER_HASH" ]] || exit 1'
+ # Wasmpack
+ - 'BEFORE_HASH=$(sha256sum ./backup-client-wasm/wasm/backup-client-wasm_bg.wasm)'
+ - './scripts/run_wasmpack.sh'
+ - 'AFTER_HASH=$(sha256sum ./backup-client-wasm/wasm/backup-client-wasm_bg.wasm)'
+ - 'echo $BEFORE_HASH $AFTER_HASH'
+ - '[[ "$BEFORE_HASH" == "$AFTER_HASH" ]] || exit 1'
retry:
automatic: true
plugins:
diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -1696,7 +1696,7 @@
if (file_exists(tempAttachmentsPath)) {
Logger::log(
"Attempting to delete temporary attachments file from previous backup "
- "attempt.");
+ "attempt. Change log for testing WASM changes.");
attempt_delete_file(
tempAttachmentsPath,
"Failed to delete temporary attachments file from previous backup "
diff --git a/shared/backup_client/src/lib.rs b/shared/backup_client/src/lib.rs
--- a/shared/backup_client/src/lib.rs
+++ b/shared/backup_client/src/lib.rs
@@ -22,7 +22,7 @@
};
const LOG_DOWNLOAD_RETRY_DELAY: Duration = Duration::from_secs(5);
-const LOG_DOWNLOAD_MAX_RETRY: usize = 3;
+const LOG_DOWNLOAD_MAX_RETRY: usize = 5;
#[cfg(target_arch = "wasm32")]
use wasm_bindgen::prelude::wasm_bindgen;

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 28, 11:21 AM (20 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2593846
Default Alt Text
D11115.id37353.diff (2 KB)

Event Timeline