diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1e8b3c044..fa7cd6b0d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -79,13 +79,6 @@ jobs: runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 20 steps: - - name: Install cargo-c - env: - LINK: https://github.com/lu-zero/cargo-c/releases/download/v0.10.7 - CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz - run: | - curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin - - uses: actions/checkout@v3 - name: Install uv @@ -96,9 +89,6 @@ jobs: - name: Set up Python run: uv python install - - name: Install the project - run: uv sync --all-extras --dev --all-packages - - uses: "./.github/shared/install_sqlite" - name: Test run: make test diff --git a/Makefile b/Makefile index d96ee8b0c..bab5001ed 100644 --- a/Makefile +++ b/Makefile @@ -52,14 +52,18 @@ uv-sync: uv sync --all-packages .PHONE: uv-sync -test: limbo uv-sync test-compat test-vector test-sqlite3 test-shell test-memory test-write test-update test-constraint test-collate test-extensions +uv-sync-test: + uv sync --all-extras --dev --package turso_test +.PHONE: uv-sync + +test: limbo uv-sync-test test-compat test-vector test-sqlite3 test-shell test-memory test-write test-update test-constraint test-collate test-extensions .PHONY: test -test-extensions: limbo uv-sync +test-extensions: limbo uv-sync-test RUST_LOG=$(RUST_LOG) uv run --project limbo_test test-extensions .PHONY: test-extensions -test-shell: limbo uv-sync +test-shell: limbo uv-sync-test RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) uv run --project limbo_test test-shell .PHONY: test-shell @@ -89,11 +93,11 @@ test-json: RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) ./testing/json.test .PHONY: test-json -test-memory: limbo uv-sync +test-memory: limbo uv-sync-test RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) uv run --project limbo_test test-memory .PHONY: test-memory -test-write: limbo uv-sync +test-write: limbo uv-sync-test @if [ "$(SQLITE_EXEC)" != "scripts/limbo-sqlite3" ]; then \ RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) uv run --project limbo_test test-write; \ else \ @@ -101,7 +105,7 @@ test-write: limbo uv-sync fi .PHONY: test-write -test-update: limbo uv-sync +test-update: limbo uv-sync-test @if [ "$(SQLITE_EXEC)" != "scripts/limbo-sqlite3" ]; then \ RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) uv run --project limbo_test test-update; \ else \ @@ -109,7 +113,7 @@ test-update: limbo uv-sync fi .PHONY: test-update -test-collate: limbo uv-sync +test-collate: limbo uv-sync-test @if [ "$(SQLITE_EXEC)" != "scripts/limbo-sqlite3" ]; then \ RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) uv run --project limbo_test test-collate; \ else \ @@ -117,7 +121,7 @@ test-collate: limbo uv-sync fi .PHONY: test-collate -test-constraint: limbo uv-sync +test-constraint: limbo uv-sync-test @if [ "$(SQLITE_EXEC)" != "scripts/limbo-sqlite3" ]; then \ RUST_LOG=$(RUST_LOG) SQLITE_EXEC=$(SQLITE_EXEC) uv run --project limbo_test test-constraint; \ else \ @@ -125,7 +129,7 @@ test-constraint: limbo uv-sync fi .PHONY: test-constraint -bench-vfs: uv-sync +bench-vfs: uv-sync-test cargo build --release RUST_LOG=$(RUST_LOG) uv run --project limbo_test bench-vfs "$(SQL)" "$(N)"