Merge branch 'main' into refactor-things

dojoengine · Jul 31, 2024 · 25358dc · 25358dc
2 parents 2420ac4 + f14c445
commit 25358dc
Show file tree

Hide file tree

Showing 238 changed files with 14,622 additions and 8,061 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust
 {
 	"name": "Rust",
-	"image": "ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1",
+	"image": "ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3",
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -14,7 +14,7 @@ jobs:
   bench-katana:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
     needs: ensure-docker
     runs-on: ubuntu-latest-32-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -43,8 +43,6 @@ jobs:
           chmod +x /tmp/bins/katana
           KATANA_RUNNER_BIN=/tmp/bins/katana cargo llvm-cov nextest --no-report --all-features --workspace --exclude katana --build-jobs 20
           cargo llvm-cov nextest --no-report -p katana
-          # TODO(kariy): uncomment this line when `sir` feature support Cairo 2.6.3
-          # cargo llvm-cov nextest --no-report -p katana --no-default-features --features sir
           cargo llvm-cov report --lcov --output-path lcov.info
       - uses: codecov/codecov-action@v4
         with:
@@ -54,7 +52,7 @@ jobs:
   ensure-wasm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -105,7 +103,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.6.3"
+          scarb-version: "2.7.0-rc.3"
       - run: |
           scarb --manifest-path examples/spawn-and-move/Scarb.toml fmt --check
           scarb --manifest-path crates/dojo-core/Scarb.toml fmt --check
@@ -114,7 +112,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -129,7 +127,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -143,7 +141,7 @@ jobs:
   dojo-world-bindings-check:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -152,7 +150,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest-4-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -161,7 +159,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -170,7 +168,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml
@@ -14,7 +14,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.1
+      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.3
     env:
       VERSION: ""
     steps:

diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-scarb 2.6.4
+scarb 2.7.0-rc.3