From 85468db75c050aa3baa16897f93be295a45e2eb8 Mon Sep 17 00:00:00 2001 From: Ammar Arif Date: Mon, 20 Apr 2026 12:19:15 -0500 Subject: [PATCH] ci: bump dojo-integration-test dojo ref to current main HEAD Updates the pinned dojoengine/dojo revision used by dojo-integration-test from v1.7.0-alpha.2 to a6c6047d5e038b83041e06ecfb704ab390981140 so the integration test runs against the current tip of dojo's main branch, which includes dojoengine/dojo#3402. Also bumps scarb from dev-2025-09-05 to 2.13.1 to match the cairo/starknet 2.13 pins in examples/spawn-and-move/Scarb.toml, switches the project build step from sozo build to scarb build, clones Dojo into /tmp/dojo instead of inside \$GITHUB_WORKSPACE so proc-macro resolution during scarb build doesn't collide with Katana's root Cargo.toml workspace, builds sozo from the cloned Dojo source so migrate runs with the sozo matching the revision under test instead of a stale asdf-installed release, and starts Katana with --dev --dev.no-fee so sozo migrate transactions aren't rejected by the mempool. The no-fee flag is needed because Katana's genesis block header is initialized with GasPrices::MIN (1 wei) while the live gas oracle used by mempool validation returns 20 gwei, and sozo (via starknet-rs) estimates fees against BlockTag::Latest which points to genesis right after startup, so the estimated max L1 gas price ends up at 1 wei and gets rejected against the oracle's 20 gwei floor. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/test.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c11c492fa..69954c4c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -405,8 +405,6 @@ 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: @@ -433,23 +431,34 @@ jobs: run: chmod +x ./katana - name: Start Katana - run: ./katana > katana.log 2>&1 & + run: ./katana --dev --dev.no-fee > katana.log 2>&1 & - - name: Checkout Dojo repository - uses: actions/checkout@v3 - with: - repository: dojoengine/dojo - ref: v1.7.0-alpha.2 - path: dojo + # Clone outside $GITHUB_WORKSPACE so Dojo's Cargo.toml doesn't collide with + # Katana's workspace during proc-macro resolution. + - name: Clone Dojo repository + run: | + mkdir -p /tmp/dojo + cd /tmp/dojo + git init -q + git remote add origin https://github.com/dojoengine/dojo.git + git fetch --depth=1 origin a6c6047d5e038b83041e06ecfb704ab390981140 + git checkout FETCH_HEAD - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "dev-2025-09-05" + scarb-version: "2.13.1" + + # Build sozo from the pinned Dojo source so the migrate step runs with the + # sozo matching the Dojo revision under test, not a stale asdf-installed release. + - name: Build sozo from Dojo source + run: | + cd /tmp/dojo + cargo build --release --bin sozo - name: Build and migrate `spawn-and-move` project run: | - cd dojo/examples/spawn-and-move - sozo build && sozo migrate + cd /tmp/dojo/examples/spawn-and-move + scarb build && /tmp/dojo/target/release/sozo migrate - name: Output Katana logs on failure if: failure()