diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 20a449e03..adede078c 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -87,7 +87,7 @@ jobs: - name: Download builder playground uses: flashbots/flashbots-toolchain@v0.1 with: - builder-playground: v0.1.3-reth-1.4.8 + builder-playground: v0.3.1 # https://github.com/swatinem/rust-cache - name: Run Swatinem/rust-cache@v2 @@ -111,7 +111,28 @@ jobs: run: cargo build --features="${{ matrix.features }}" - name: Run the playground - run: builder-playground & + run: | + builder-playground start l1 --use-native-reth > /tmp/playground.log 2>&1 & + PLAYGROUND_PID=$! + echo "Waiting for all services to be healthy..." + timeout=60 # 1 minutes timeout + elapsed=0 + while [ $elapsed -lt $timeout ]; do + if grep -q "All services are healthy" /tmp/playground.log 2>/dev/null; then + echo "All services are healthy!" + break + fi + sleep 2 + elapsed=$((elapsed + 2)) + done + if [ $elapsed -ge $timeout ]; then + echo "Timeout waiting for services to be healthy" + echo "Last 50 lines of playground output:" + tail -n 50 /tmp/playground.log || true + kill $PLAYGROUND_PID 2>/dev/null || true + exit 1 + fi + echo "Playground is running (PID: $PLAYGROUND_PID)" - name: Run integration tests with flags run: cargo test --features="${{ matrix.features }}" --package rbuilder --lib -- integration --test-threads=1 @@ -123,7 +144,7 @@ jobs: if: ${{ failure() }} run: | mkdir /tmp/playground-logs - mv $HOME/.playground/devnet/logs /tmp/playground-logs + mv $HOME/.local/state/builder-playground/devnet/logs /tmp/playground-logs mv integration_logs /tmp/playground-logs - name: Archive playground logs diff --git a/crates/rbuilder/src/integration/test_data/config-playground-http-blocklist.toml b/crates/rbuilder/src/integration/test_data/config-playground-http-blocklist.toml index 979d99371..3e6b7d997 100644 --- a/crates/rbuilder/src/integration/test_data/config-playground-http-blocklist.toml +++ b/crates/rbuilder/src/integration/test_data/config-playground-http-blocklist.toml @@ -1,8 +1,8 @@ -chain = "$HOME/.playground/devnet/genesis.json" -reth_datadir = "$HOME/.playground/devnet/data_reth" +chain = "$HOME/.local/state/builder-playground/devnet/genesis.json" +reth_datadir = "$HOME/.local/state/builder-playground/devnet/volume-el-data" relay_secret_key = "5eae315483f028b5cdd5d1090ff0c7618b18737ea9bf3c35047189db22835c48" -el_node_ipc_path = "$HOME/.playground/devnet/reth.ipc" +el_node_ipc_path = "$HOME/.local/state/builder-playground/devnet/volume-el-data/reth.ipc" live_builders = ["mgp-ordering"] enabled_relays = ["playground"] log_level = "info,rbuilder=debug" diff --git a/crates/rbuilder/src/integration/test_data/config-playground.toml b/crates/rbuilder/src/integration/test_data/config-playground.toml index 43fb5bb61..fefb233d5 100644 --- a/crates/rbuilder/src/integration/test_data/config-playground.toml +++ b/crates/rbuilder/src/integration/test_data/config-playground.toml @@ -1,8 +1,8 @@ -chain = "$HOME/.playground/devnet/genesis.json" -reth_datadir = "$HOME/.playground/devnet/data_reth" +chain = "$HOME/.local/state/builder-playground/devnet/genesis.json" +reth_datadir = "$HOME/.local/state/builder-playground/devnet/volume-el-data" relay_secret_key = "5eae315483f028b5cdd5d1090ff0c7618b18737ea9bf3c35047189db22835c48" -el_node_ipc_path = "$HOME/.playground/devnet/reth.ipc" +el_node_ipc_path = "$HOME/.local/state/builder-playground/devnet/volume-el-data/reth.ipc" live_builders = ["mgp-ordering"] enabled_relays = ["playground"] log_level = "info,rbuilder=debug"