Skip to content

Commit

Permalink
Merge branch 'main' of github.com:dojoengine/dojo into feat/config-bu…
Browse files Browse the repository at this point in the history
…ilder
  • Loading branch information
edisontim committed Jan 5, 2025
2 parents 52dc084 + 07bb880 commit da17b3c
Show file tree
Hide file tree
Showing 403 changed files with 27,550 additions and 10,194 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:v1.0.0-rc.1",
"image": "ghcr.io/dojoengine/dojo-dev:v1.0.9",
"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-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
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-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/checkout@v3
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.79.0
RUST_VERSION: 1.80.0

jobs:
build:
Expand All @@ -31,7 +31,7 @@ jobs:
needs: ensure-docker
runs-on: ubuntu-latest-32-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -56,7 +56,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -139,7 +139,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -154,7 +154,7 @@ jobs:
clippy:
runs-on: ubuntu-latest-4-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -163,7 +163,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -172,7 +172,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -193,7 +193,7 @@ jobs:
sudo apt update && sudo apt install ./hurl_3.0.0_amd64.deb
chmod +x /tmp/bins/katana
chmod +x /tmp/bins/sozo
nohup /tmp/bins/katana --accounts 2 --disable-fee &
nohup /tmp/bins/katana --dev --dev.accounts 2 --dev.no-fee &
- run: |
/tmp/bins/sozo --manifest-path examples/spawn-and-move/Scarb.toml build
/tmp/bins/sozo --manifest-path examples/spawn-and-move/Scarb.toml migrate
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
with:
# We have to use a PAT in order to trigger ci
token: ${{ secrets.CREATE_PR_TOKEN }}
title: "Update devcontainer image: ${{ needs.build-and-push.outputs.tag_name }}"
title: "chore(devcontainer): update image: ${{ needs.build-and-push.outputs.tag_name }}"
commit-message: "Update devcontainer image: ${{ needs.build-and-push.outputs.tag_name }}"
branch: bump-devcontainer
base: main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ jobs:
name: Move cache
run: |
rm -rf /tmp/.buildx-cache/prebuild
mv /tmp/.buildx-cache-new/prebuild /tmp/.buildx-cache/prebuild
mv /tmp/.buildx-cache-new/prebuild /tmp/.buildx-cache/prebuild || true
rm -rf /tmp/.buildx-cache/build
mv /tmp/.buildx-cache-new/build /tmp/.buildx-cache/build
mv /tmp/.buildx-cache-new/build /tmp/.buildx-cache/build || true
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-rc.1
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
env:
VERSION: ""
steps:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "crates/katana/contracts/messaging/solidity/lib/forge-std"]
path = crates/katana/contracts/messaging/solidity/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "crates/katana/contracts/piltover"]
path = crates/katana/contracts/piltover
url = https://github.com/cartridge-gg/piltover.git
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ The [Dojo Book repository](https://github.com/dojoengine/book) is where you shou

## Final Notes

Again, thank you for considering to contribute to Dojo. Your contribution is invaluable to us. We hope this guide makes the contribution process clear and answers any questions you might have. If not, feel free to ask on the [Discord](https://discord.gg/PwDa2mKhR4) or on [GitHub](https://github.com/dojoengine/dojo/issues).
Again, thank you for considering to contribute to Dojo. Your contribution is invaluable to us. We hope this guide makes the contribution process clear and answers any questions you might have. If not, feel free to ask on the [Discord](https://discord.com/invite/dojoengine) or on [GitHub](https://github.com/dojoengine/dojo/issues).
Loading

0 comments on commit da17b3c

Please sign in to comment.