From 74713aa0da814b5e85de7bca01ad5b9540f03889 Mon Sep 17 00:00:00 2001 From: Xuefei Han Date: Sun, 7 Jan 2024 16:26:55 -0800 Subject: [PATCH 1/8] fixed cargo-udeps failure issue --- .github/workflows/cargo-udeps.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cargo-udeps.yml b/.github/workflows/cargo-udeps.yml index 656b097b03..78f4e51f07 100644 --- a/.github/workflows/cargo-udeps.yml +++ b/.github/workflows/cargo-udeps.yml @@ -16,7 +16,9 @@ jobs: issues: write steps: - uses: actions/checkout@v3 - + + - run: rustup update stable + - uses: dtolnay/rust-toolchain@master with: # cargo-udeps require nightly to run From f5740417ffcb146e3f740ef34e508f3ccecbdc6f Mon Sep 17 00:00:00 2001 From: Xuefei Han Date: Mon, 8 Jan 2024 08:22:27 -0800 Subject: [PATCH 2/8] Set Rust version to latest stable version --- .github/workflows/cargo-udeps.yml | 2 -- .github/workflows/ci.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cargo-udeps.yml b/.github/workflows/cargo-udeps.yml index 78f4e51f07..599e89ed01 100644 --- a/.github/workflows/cargo-udeps.yml +++ b/.github/workflows/cargo-udeps.yml @@ -17,8 +17,6 @@ jobs: steps: - uses: actions/checkout@v3 - - run: rustup update stable - - uses: dtolnay/rust-toolchain@master with: # cargo-udeps require nightly to run diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5042e6ebd..f7e7b070d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: 1.70.0 + RUST_VERSION: stable jobs: test: From 3798189b2baaf78b3ca1497f57c879a4f408e65d Mon Sep 17 00:00:00 2001 From: fishseabowl Date: Tue, 9 Jan 2024 21:39:33 -0800 Subject: [PATCH 3/8] Upgrade rust toolchain to 1.74.0 --- .devcontainer/Dockerfile | 4 ++-- .github/workflows/release.yml | 2 +- Cargo.lock | 2 +- rust-toolchain.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 29720815d3..48e96820a3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -37,14 +37,14 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \ mv hurl-4.1.0-aarch64-unknown-linux-gnu/hurl /usr/local/bin/ && \ rm -r hurl-4.1.0-aarch64-unknown-linux-gnu && \ rm hurl.tar.gz && \ - rustup component add llvm-tools-preview --toolchain 1.70.0-aarch64-unknown-linux-gnu; \ + rustup component add llvm-tools-preview --toolchain 1.74.0-aarch64-unknown-linux-gnu; \ elif [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \ curl -L https://github.com/Orange-OpenSource/hurl/releases/download/4.1.0/hurl-4.1.0-x86_64-unknown-linux-gnu.tar.gz -o hurl.tar.gz && \ tar -xzf hurl.tar.gz && \ mv hurl-4.1.0-x86_64-unknown-linux-gnu/hurl /usr/local/bin/ && \ rm -r hurl-4.1.0-x86_64-unknown-linux-gnu && \ rm hurl.tar.gz && \ - rustup component add llvm-tools-preview --toolchain 1.70.0-x86_64-unknown-linux-gnu && \ + rustup component add llvm-tools-preview --toolchain 1.74.0-x86_64-unknown-linux-gnu && \ rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly; \ fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1212b3094c..5fd3f3870b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: 1.70.0 + RUST_VERSION: 1.74.0 REGISTRY_IMAGE: ghcr.io/${{ github.repository }} jobs: diff --git a/Cargo.lock b/Cargo.lock index 9403e074b1..468168b43e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2827,7 +2827,7 @@ dependencies = [ [[package]] name = "dojo-world-abigen" -version = "0.1.0" +version = "0.4.4" dependencies = [ "cairo-lang-starknet", "camino", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 22048ac5bb..639f4f17d9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.70.0" +channel = "1.74.0" From a97ec6d10f76e25cc61509999ab949d454bfc658 Mon Sep 17 00:00:00 2001 From: fishseabowl Date: Tue, 9 Jan 2024 21:45:53 -0800 Subject: [PATCH 4/8] Upgrade rust to 1.74.0 in ci.yml --- .github/workflows/cargo-udeps.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cargo-udeps.yml b/.github/workflows/cargo-udeps.yml index 599e89ed01..656b097b03 100644 --- a/.github/workflows/cargo-udeps.yml +++ b/.github/workflows/cargo-udeps.yml @@ -16,7 +16,7 @@ jobs: issues: write steps: - uses: actions/checkout@v3 - + - uses: dtolnay/rust-toolchain@master with: # cargo-udeps require nightly to run diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7e7b070d0..0cb03f4463 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: stable + RUST_VERSION: 1.74.0 jobs: test: From 51357fc16dda10339e2f6b367b17b4a5d98eabfc Mon Sep 17 00:00:00 2001 From: fishseabowl Date: Wed, 10 Jan 2024 00:45:33 -0800 Subject: [PATCH 5/8] Update Dockerfile to add misssing compoment --- .devcontainer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 48e96820a3..51f010a628 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -18,14 +18,14 @@ RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/ca RUN rustup toolchain install $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \ rustup default $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \ - rustup component add clippy && \ - rustup component add rustfmt + rustup component add clippy --toolchain $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \ + rustup component add rustfmt --toolchain $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) RUN rustup toolchain install nightly && \ rustup component add rustfmt --toolchain nightly RUN rustup target add x86_64-pc-windows-msvc && \ - rustup target add wasm32-unknown-unknown + rustup target add wasm32-unknown-unknown --toolchain $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) RUN cargo binstall cargo-get cargo-nextest cargo-llvm-cov cargo-release --secure -y From 4a84c3dd47b3b89f039f0ddb1c851fa95742128a Mon Sep 17 00:00:00 2001 From: fishseabowl Date: Wed, 10 Jan 2024 07:59:32 -0800 Subject: [PATCH 6/8] Set clippy and wasm32 to default Rust toolchain --- .devcontainer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 51f010a628..48e96820a3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -18,14 +18,14 @@ RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/ca RUN rustup toolchain install $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \ rustup default $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \ - rustup component add clippy --toolchain $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \ - rustup component add rustfmt --toolchain $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) + rustup component add clippy && \ + rustup component add rustfmt RUN rustup toolchain install nightly && \ rustup component add rustfmt --toolchain nightly RUN rustup target add x86_64-pc-windows-msvc && \ - rustup target add wasm32-unknown-unknown --toolchain $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) + rustup target add wasm32-unknown-unknown RUN cargo binstall cargo-get cargo-nextest cargo-llvm-cov cargo-release --secure -y From 78bb8ca0cf646c631c5cbf759240e5573a8e1e26 Mon Sep 17 00:00:00 2001 From: fishseabowl Date: Wed, 10 Jan 2024 14:27:57 -0800 Subject: [PATCH 7/8] Update to 136a67a container --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/release-dispatch.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cb03f4463..4ff6eac5fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: test: runs-on: ubuntu-latest-16-cores container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -28,7 +28,7 @@ jobs: ensure-wasm: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -61,7 +61,7 @@ jobs: dojo-core-test: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -70,7 +70,7 @@ jobs: dojo-spawn-and-move-example-test: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -79,7 +79,7 @@ jobs: dojo-world-bindings-check: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -88,7 +88,7 @@ jobs: clippy: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -97,7 +97,7 @@ jobs: fmt: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -106,7 +106,7 @@ jobs: docs: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml index 1306b4c466..ca672d9de2 100644 --- 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:448ffda + image: ghcr.io/dojoengine/dojo-dev:136a67a steps: # Workaround described here: https://github.com/actions/checkout/issues/760 - uses: actions/checkout@v3 From 7b662a161918031e9b4bd623d2824305665b1c88 Mon Sep 17 00:00:00 2001 From: fishseabowl Date: Wed, 10 Jan 2024 14:33:47 -0800 Subject: [PATCH 8/8] Update to devcontianer.json --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 08adc14f5d..6d4d5427a7 100644 --- 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:448ffda", + "image": "ghcr.io/dojoengine/dojo-dev:136a67a", "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt",