Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into katana/Messaging-Intr…
Browse files Browse the repository at this point in the history
…egation-Testing
  • Loading branch information
fabrobles92 committed Jun 3, 2024
2 parents 758ce41 + d9c4f4f commit 6548532
Show file tree
Hide file tree
Showing 11 changed files with 702 additions and 216 deletions.
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:v0.7.0-alpha.4",
"image": "ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
test:
runs-on: ubuntu-latest-32-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -33,7 +33,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
dojo-core-test:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -76,7 +76,7 @@ jobs:
dojo-spawn-and-move-example-test:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -85,7 +85,7 @@ jobs:
dojo-world-bindings-check:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -94,7 +94,7 @@ jobs:
clippy:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -103,7 +103,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -112,7 +112,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
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:v0.7.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:v0.7.0-alpha.5
env:
VERSION: ""
steps:
Expand Down
2 changes: 0 additions & 2 deletions crates/dojo-world/src/metadata_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ socials.x = "https://x.com/dojostarknet"
assert_eq!(world.socials.unwrap().get("x"), Some(&"https://x.com/dojostarknet".to_string()));
}

// TODO: remove ignore once IPFS node is running.
#[ignore]
#[tokio::test]
async fn world_metadata_hash_and_upload() {
let meta = WorldMetadata {
Expand Down
Loading

0 comments on commit 6548532

Please sign in to comment.