Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
key: ci-${{ github.job }}
shared-key: katana-ci-cache
shared-key: katana-ci-cache-nightly

- name: Download test artifacts
uses: actions/download-artifact@v5
Expand Down Expand Up @@ -193,8 +193,7 @@ jobs:
- name: Add binary to PATH
run: |
chmod +x katana
export PATH="$(pwd):$GITHUB_PATH"
echo $PATH > $GITHUB_PATH
echo "$(pwd)" >> $GITHUB_PATH

- name: Run tests
if: github.event_name != 'pull_request'
Expand Down Expand Up @@ -290,6 +289,8 @@ jobs:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
container:
image: ghcr.io/dojoengine/katana-dev:latest
env:
ASDF_SOZO_VERSION: "1.7.0"
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -331,10 +332,7 @@ jobs:

- name: Build and migrate `spawn-and-move` project
run: |
cd dojo
cargo install --path bin/sozo --locked --force

cd examples/spawn-and-move
cd dojo/examples/spawn-and-move
sozo build && sozo migrate

- name: Output Katana logs on failure
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ tests/snos/snos
snos-env
tests/fixtures/katana_db

# Ignore all files under tests/fixtures/db except .tar.gz files
# Ignore generated DB fixture directories; keep only committed tarballs
tests/fixtures/db/*
!tests/fixtures/db/*.tar.gz
!tests/fixtures/db/1_6_0.tar.gz
!tests/fixtures/db/snos.tar.gz

crates/contracts/build/
!crates/contracts/build/legacy/
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ usage help:
@echo " fixtures: Prepare tests artifacts (including test database)."
@echo " snos-artifacts: Prepare SNOS tests artifacts."
@echo " db-compat-artifacts: Prepare database compatibility test artifacts."
@echo " generate-db-fixtures: Generate spawn-and-move and simple DB fixtures (requires scarb + sozo)."
@echo " native-deps-macos: Install cairo-native dependencies for macOS."
@echo " native-deps-linux: Install cairo-native dependencies for Linux."
@echo " native-deps-windows: Install cairo-native dependencies for Windows."
Expand All @@ -68,6 +69,9 @@ install-scarb:
snos-artifacts: $(SNOS_OUTPUT)
@echo "SNOS test artifacts prepared successfully."

db-compat-artifacts: $(COMPATIBILITY_DB_DIR)
@echo "Database compatibility test artifacts prepared successfully."

fixtures: $(SNOS_DB_DIR) $(SNOS_OUTPUT) $(COMPATIBILITY_DB_DIR) $(SPAWN_AND_MOVE_DB) $(SIMPLE_DB) contracts
@echo "All test fixtures prepared successfully."

Expand Down
1 change: 1 addition & 0 deletions crates/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ tower-service.workspace = true
[dev-dependencies]
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
hex = "0.4"
katana-utils = { workspace = true, features = ["node"] }

[build-dependencies]
tonic-build.workspace = true
Loading
Loading