Merge branch 'dojoengine:main' into feat/deck-from-bitmap

dojoengine · Dec 11, 2023 · ee48689 · ee48689
2 parents bea4ddf + eb52cb6
commit ee48689
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: Origami CI
 on: [push, pull_request]
 
 env:
-  DOJO_VERSION: v0.3.14
+  DOJO_VERSION: v0.3.15
   SCARB_VERSION: v2.3.1
 
 jobs:
@@ -41,6 +41,17 @@ jobs:
         run: sozo test -f origami
         shell: bash
 
+  token:
+    needs: [check, build]
+    runs-on: ubuntu-latest
+    name: Test token
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup
+      - name: Test
+        run: sozo test -f token
+        shell: bash
+
   market:
     needs: [check, build]
     runs-on: ubuntu-latest

diff --git a/Scarb.lock b/Scarb.lock
@@ -8,8 +8,8 @@ source = "git+https://github.com/influenceth/cubit?rev=b459053#b4590530d5aeae9aa
 
 [[package]]
 name = "dojo"
-version = "0.3.14"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.3.14#d7e9788459f3b2e797b6565f1057c96a6f5f8cc2"
+version = "0.3.15"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.15#cdbaca4121b1642e1a8ca40d6831bad73d28ed26"
 dependencies = [
  "dojo_plugin",
 ]

diff --git a/Scarb.toml b/Scarb.toml
@@ -9,5 +9,5 @@ authors = ["[email protected]"]
 
 [workspace.dependencies]
 cubit = { git = "https://github.com/influenceth/cubit", rev = "b459053" }
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.14" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.15" }
 origami = { path = "crates" }