From edd4d7f5b8643e6e29f523b4168f88daadc72b01 Mon Sep 17 00:00:00 2001 From: dante <45801863+alexander-camuto@users.noreply.github.com> Date: Fri, 25 Jul 2025 10:19:13 -0400 Subject: [PATCH] fix: less bleeding edge toolchain (#992) --- .github/workflows/engine.yml | 4 +- .github/workflows/large-tests.yml | 2 +- .github/workflows/pypi.yml | 4 +- .github/workflows/release.yml | 20 ++++----- .github/workflows/rust.yml | 60 +++++++++++++-------------- .github/workflows/static-analysis.yml | 2 +- rust-toolchain | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/engine.yml b/.github/workflows/engine.yml index 7b37af5d..30605c4f 100644 --- a/.github/workflows/engine.yml +++ b/.github/workflows/engine.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy cache: false @@ -42,7 +42,7 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2025-05-01-x86_64-unknown-linux-gnu - name: Install binaryen run: | set -e diff --git a/.github/workflows/large-tests.yml b/.github/workflows/large-tests.yml index f8f75cc0..9fd92155 100644 --- a/.github/workflows/large-tests.yml +++ b/.github/workflows/large-tests.yml @@ -15,7 +15,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - name: nanoGPT Mock diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 0430385e..1fda1945 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -50,7 +50,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy cache: false @@ -116,7 +116,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy cache: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f35514d9..1baeea2c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: steps: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy cache: false @@ -118,27 +118,27 @@ jobs: include: - build: windows-msvc os: windows-latest - rust: nightly-2025-06-16 + rust: nightly-2025-05-01 target: x86_64-pc-windows-msvc - build: macos os: macos-13 - rust: nightly-2025-06-16 + rust: nightly-2025-05-01 target: x86_64-apple-darwin - build: macos-aarch64 os: macos-13 - rust: nightly-2025-06-16 + rust: nightly-2025-05-01 target: aarch64-apple-darwin - build: linux-musl - os: ubuntu-latest-64-cores - rust: nightly-2025-06-16 + os: ubuntu-22.04 + rust: nightly-2025-05-01 target: x86_64-unknown-linux-musl - build: linux-gnu - os: ubuntu-latest-64-cores - rust: nightly-2025-06-16 + os: ubuntu-22.04 + rust: nightly-2025-05-01 target: x86_64-unknown-linux-gnu - build: linux-aarch64 - os: ubuntu-latest-64-cores - rust: nightly-2025-06-16 + os: ubuntu-22.04 + rust: nightly-2025-05-01 target: aarch64-unknown-linux-gnu steps: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 502614d7..4b315f72 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,7 +33,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 @@ -57,7 +57,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - name: Build @@ -75,7 +75,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - name: Docs @@ -93,7 +93,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -118,7 +118,7 @@ jobs: # persist-credentials: false # - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 # with: - # toolchain: nightly-2025-06-16 + # toolchain: nightly-2025-05-01 # override: true # components: rustfmt, clippy # - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -154,7 +154,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -192,7 +192,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy @@ -231,7 +231,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -258,7 +258,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa #v0.4.0 @@ -271,7 +271,7 @@ jobs: - name: Install wasm32-unknown-unknown run: rustup target add wasm32-unknown-unknown - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2025-05-01-x86_64-unknown-linux-gnu - name: Create webdriver.json to disable timeouts run: | echo '{"args": ["--headless", "--disable-gpu", "--disable-dev-shm-usage", "--no-sandbox"]}' > webdriver.json @@ -297,7 +297,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -370,7 +370,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa #v0.4.0 @@ -394,7 +394,7 @@ jobs: node-version: "18.12.1" cache: "pnpm" - name: "Add rust-src" - run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2025-05-01-x86_64-unknown-linux-gnu - name: Install dependencies for js tests and package run: | pnpm install --frozen-lockfile @@ -433,7 +433,7 @@ jobs: # persist-credentials: false # - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 # with: - # toolchain: nightly-2025-06-16 + # toolchain: nightly-2025-05-01 # override: true # components: rustfmt, clippy # - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa #v0.4.0 @@ -441,7 +441,7 @@ jobs: # # Pin to version 0.12.1 # version: 'v0.12.1' # - name: Add rust-src - # run: rustup component add rust-src --toolchain nightly-2025-06-16 + # run: rustup component add rust-src --toolchain nightly-2025-05-01 # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 # with: # persist-credentials: false @@ -473,7 +473,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa #v0.4.0 @@ -484,7 +484,7 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2025-05-01-x86_64-unknown-linux-gnu - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 with: persist-credentials: false @@ -551,11 +551,11 @@ jobs: # persist-credentials: false # - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 # with: - # toolchain: nightly-2025-06-16 + # toolchain: nightly-2025-05-01 # override: true # components: rustfmt, clippy # - name: Add rust-src - # run: rustup component add rust-src --toolchain nightly-2025-06-16-x86_64-unknown-linux-gnu + # run: rustup component add rust-src --toolchain nightly-2025-05-01-x86_64-unknown-linux-gnu # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 # - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 # with: @@ -594,7 +594,7 @@ jobs: - uses: dtolnay/rust-toolchain@4f94fbe7e03939b0e674bcc9ca609a16088f63ff #nightly branch, TODO: update when required with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -614,7 +614,7 @@ jobs: # persist-credentials: false # - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 # with: - # toolchain: nightly-2025-06-16 + # toolchain: nightly-2025-05-01 # override: true # components: rustfmt, clippy # - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -640,7 +640,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -666,7 +666,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -696,7 +696,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -725,7 +725,7 @@ jobs: python-version: "3.12" - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - name: Install cmake @@ -760,7 +760,7 @@ jobs: python-version: "3.12" - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -798,7 +798,7 @@ jobs: python-version: "3.11" - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -858,7 +858,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3 #v3.3.0 @@ -866,7 +866,7 @@ jobs: crate: cargo-nextest locked: true - name: Run ios tests - run: CARGO_BUILD_TARGET=aarch64-apple-darwin RUSTUP_TOOLCHAIN=nightly-2025-06-16-aarch64-apple-darwin cargo test --test ios_integration_tests --features ios-bindings-test --no-default-features + run: CARGO_BUILD_TARGET=aarch64-apple-darwin RUSTUP_TOOLCHAIN=nightly-2025-05-01-aarch64-apple-darwin cargo test --test ios_integration_tests --features ios-bindings-test --no-default-features swift-package-tests: permissions: @@ -884,7 +884,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy - name: Build EzklCoreBindings diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 9c11750a..92eba052 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -17,7 +17,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 #v1.0.6 with: - toolchain: nightly-2025-06-16 + toolchain: nightly-2025-05-01 override: true components: rustfmt, clippy diff --git a/rust-toolchain b/rust-toolchain index da362f21..45bf249e 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-06-16" +channel = "nightly-2025-05-01" components = ["rustfmt", "clippy"]