Skip to content

Commit

Permalink
Merge remote-tracking branch 'dojo/main' into feat/dojojs-sdk-codegen
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Oct 18, 2024
2 parents e2a7957 + 90a6580 commit 688bc7d
Show file tree
Hide file tree
Showing 339 changed files with 69,529 additions and 61,551 deletions.
259 changes: 0 additions & 259 deletions .all-contributorsrc

This file was deleted.

2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.12",
"image": "ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
bench-katana:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand All @@ -36,7 +36,7 @@ jobs:
bench-sozo:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -40,12 +40,13 @@ jobs:
name: dojo-bins
path: /tmp/bins
- run: |
export PATH=/tmp/bins:$PATH
chmod +x /tmp/bins/katana
chmod +x /tmp/bins/sozo
bash scripts/build_cairo_projects.sh /tmp/bins/sozo
tar -xzf spawn-and-move-db.tar.gz -C /tmp/
tar -xzf types-test-db.tar.gz -C /tmp/
KATANA_RUNNER_BIN=/tmp/bins/katana cargo llvm-cov nextest --no-report --all-features --workspace --build-jobs 20
cargo llvm-cov nextest --no-report --all-features --workspace --build-jobs 20
cargo llvm-cov report --lcov --output-path lcov.info
- uses: codecov/codecov-action@v4
with:
Expand All @@ -55,7 +56,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -120,7 +121,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -135,7 +136,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -149,7 +150,7 @@ jobs:
dojo-world-bindings-check:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -158,7 +159,7 @@ jobs:
clippy:
runs-on: ubuntu-latest-4-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -167,7 +168,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -176,7 +177,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
contents: write
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.12
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.16
env:
VERSION: ""
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ justfile
spawn-and-move-db
types-test-db
examples/spawn-and-move/manifests/saya/**
**/*.log

artifacts/
Loading

0 comments on commit 688bc7d

Please sign in to comment.