wip

dojoengine · Aug 30, 2024 · 92b7b79 · 92b7b79
2 parents 4f67465 + 842c256
commit 92b7b79
Show file tree

Hide file tree

Showing 124 changed files with 3,012 additions and 2,940 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -27,6 +27,8 @@ ENV TABLEGEN_170_PREFIX=/usr/lib/llvm-17
 
 # To allow independent workflow of the container, the rust-toolchain is explicitely given.
 RUN echo "1.80.0" > rust_toolchain_version
+# Make sure to sync the nightly version with the scripts in ./scripts
+RUN echo "nightly-2024-08-28" > nightly_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
@@ -36,8 +38,8 @@ RUN rustup toolchain install $(cat rust_toolchain_version) && \
     rustup component add clippy && \
     rustup component add rustfmt
 
-RUN rustup toolchain install nightly && \
-    rustup component add rustfmt clippy --toolchain nightly
+RUN rustup toolchain install $(cat nightly_rust_toolchain_version) && \
+	rustup component add rustfmt clippy --toolchain $(cat nightly_rust_toolchain_version)
 
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add wasm32-unknown-unknown
@@ -60,7 +62,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
     rm -r hurl-4.1.0-x86_64-unknown-linux-gnu && \
     rm hurl.tar.gz && \
     rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-x86_64-unknown-linux-gnu && \
-    rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly; \
+    rustup target add x86_64-fortanix-unknown-sgx --toolchain $(cat nightly_rust_toolchain_version); \
     fi
 
 ARG DOJO_VERSION=stable

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -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.7",
+	"image": "ghcr.io/dojoengine/dojo-dev:e89ac13",
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -14,7 +14,7 @@ jobs:
   bench-katana:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -55,7 +55,7 @@ jobs:
   ensure-wasm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -120,7 +120,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -135,7 +135,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -149,7 +149,7 @@ jobs:
   dojo-world-bindings-check:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -158,7 +158,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest-4-cores
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -167,7 +167,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
@@ -176,7 +176,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     steps:
       - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml
@@ -14,7 +14,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/dojoengine/dojo-dev:v1.0.0-alpha.7
+      image: ghcr.io/dojoengine/dojo-dev:e89ac13
     env:
       VERSION: ""
     steps: