Skip to content

Commit

Permalink
Merge branch 'main' into pagination-grpc
Browse files Browse the repository at this point in the history
  • Loading branch information
Larkooo authored Aug 6, 2024
2 parents e26e126 + 1c0e8cc commit 7e42534
Show file tree
Hide file tree
Showing 67 changed files with 2,968 additions and 2,708 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV LLVM_SYS_170_PREFIX=/usr/lib/llvm-17
ENV TABLEGEN_170_PREFIX=/usr/lib/llvm-17

# To allow independent workflow of the container, the rust-toolchain is explicitely given.
RUN echo "1.79.0" > rust_toolchain_version
RUN echo "1.80.0" > rust_toolchain_version

# Install cargo-binstall
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
Expand All @@ -37,7 +37,7 @@ RUN rustup toolchain install $(cat rust_toolchain_version) && \
rustup component add rustfmt

RUN rustup toolchain install nightly && \
rustup component add rustfmt --toolchain nightly
rustup component add rustfmt clippy --toolchain nightly

RUN rustup target add x86_64-pc-windows-msvc && \
rustup target add wasm32-unknown-unknown
Expand Down
21 changes: 12 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.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -52,7 +52,7 @@ jobs:
ensure-wasm:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -73,6 +73,9 @@ jobs:
- uses: arduino/setup-protoc@v2
with:
repo-token: ${{ secrets.github_token }}
- uses: ilammy/setup-nasm@v1
with:
version: "2.15.05"
- run: cargo build --target x86_64-pc-windows-msvc --bins

# This job is used to ensure the built katana image doesn't depend on any
Expand Down Expand Up @@ -103,7 +106,7 @@ jobs:
- uses: actions/checkout@v3
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.7.0-rc.3"
scarb-version: "2.7.0"
- run: |
scarb --manifest-path examples/spawn-and-move/Scarb.toml fmt --check
scarb --manifest-path crates/dojo-core/Scarb.toml fmt --check
Expand All @@ -112,7 +115,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -127,7 +130,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -141,7 +144,7 @@ jobs:
dojo-world-bindings-check:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -150,7 +153,7 @@ jobs:
clippy:
runs-on: ubuntu-latest-4-cores
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -159,7 +162,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand All @@ -168,7 +171,7 @@ jobs:
docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.4
image: ghcr.io/dojoengine/dojo-dev:e1c9597
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scarb 2.7.0-rc.3
scarb 2.7.0
Loading

0 comments on commit 7e42534

Please sign in to comment.