diff --git a/.github/actions/build-wasm/action.yml b/.github/actions/build-wasm/action.yml index 4f555a0a..9dec99d9 100644 --- a/.github/actions/build-wasm/action.yml +++ b/.github/actions/build-wasm/action.yml @@ -18,10 +18,10 @@ runs: shell: bash run: | brew install cmake - brew install llvm + brew install llvm@18 brew install binaryen curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/libclang_rt.builtins-wasm32-wasi-22.0.tar.gz | \ - tar x -zf - -C /opt/homebrew/opt/llvm/lib/clang/18* + tar x -zf - -C /opt/homebrew/opt/llvm@18/lib/clang/18* curl -sS -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sysroot-22.0.tar.gz | \ sudo tar x -zf - -C /opt - name: Install Rust Nightly @@ -32,7 +32,7 @@ runs: - name: Set environment variable shell: bash run: | - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + echo "/opt/homebrew/opt/llvm@18/bin" >> $GITHUB_PATH - name: Flutter pub get working-directory: sqlite3 shell: bash @@ -43,5 +43,5 @@ runs: working-directory: sqlite3 shell: bash run: | - cmake -Dwasi_sysroot=/opt/wasi-sysroot -Dclang=/opt/homebrew/opt/llvm/bin/clang -S assets/wasm -B .dart_tool/sqlite3_build --toolchain toolchain.cmake + cmake -Dwasi_sysroot=/opt/wasi-sysroot -Dclang=/opt/homebrew/opt/llvm@18/bin/clang -S assets/wasm -B .dart_tool/sqlite3_build --toolchain toolchain.cmake cmake --build .dart_tool/sqlite3_build/ -t output -j diff --git a/sqlite3/assets/wasm/CMakeLists.txt b/sqlite3/assets/wasm/CMakeLists.txt index 6090236b..b7087a60 100644 --- a/sqlite3/assets/wasm/CMakeLists.txt +++ b/sqlite3/assets/wasm/CMakeLists.txt @@ -74,7 +74,7 @@ add_custom_target( ) base_sqlite3_target(sqlite3_debug) -file(DOWNLOAD https://raw.githubusercontent.com/sqlite/sqlite/master/src/test_vfstrace.c "${CMAKE_BINARY_DIR}/vfstrace.c") +file(DOWNLOAD https://raw.githubusercontent.com/sqlite/sqlite/version-3.44.0/src/test_vfstrace.c "${CMAKE_BINARY_DIR}/vfstrace.c") target_sources(sqlite3_debug PRIVATE "${CMAKE_BINARY_DIR}/vfstrace.c") target_compile_options(sqlite3_debug PRIVATE -g) target_compile_definitions(sqlite3_debug PRIVATE SQLITE_ENABLE_VFSTRACE SQLITE_ENABLE_API_ARMOR) diff --git a/sqlite3/powersync-sqlite-core b/sqlite3/powersync-sqlite-core index 8e4d4d18..053f7fca 160000 --- a/sqlite3/powersync-sqlite-core +++ b/sqlite3/powersync-sqlite-core @@ -1 +1 @@ -Subproject commit 8e4d4d18ceb1c0bf5b8a01a310a6aa527f6ffaec +Subproject commit 053f7fca93945f7fd7491e3c53434d59dd68129f