diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3ae1a7d..64dee01 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,10 +35,6 @@ jobs: name: Check formatting runs-on: ubuntu-latest needs: [build_jar] - strategy: - matrix: - toolchain: - - nightly steps: - uses: actions/checkout@v7 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} @@ -51,10 +47,6 @@ jobs: name: Detect unused dependencies runs-on: ubuntu-latest needs: [format] - strategy: - matrix: - toolchain: - - nightly steps: - uses: actions/checkout@v7 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} @@ -64,10 +56,6 @@ jobs: name: Run lints (debug) runs-on: ubuntu-latest needs: [machete] - strategy: - matrix: - toolchain: - - nightly steps: - uses: actions/checkout@v7 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} @@ -94,10 +82,6 @@ jobs: name: Run lints (release) runs-on: ubuntu-latest needs: [machete] - strategy: - matrix: - toolchain: - - nightly steps: - uses: actions/checkout@v7 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} @@ -134,8 +118,6 @@ jobs: windows-11-arm, macos-latest, ] - toolchain: - - nightly steps: - uses: actions/checkout@v7 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} diff --git a/README.md b/README.md index e00b52a..2fb7073 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,6 @@ A plugin for [PumpkinMC](https://pumpkinmc.org/) that adds support for [PaperMC] If you wish to contribute to PatchBukkit, follow the following steps: -> [!NOTE] -> Your PumpkinMC server must be built with the same nightly toolchain as PatchBukkit. - 1. Run `./build.sh` 2. Copy the generated native library from `rust/target/debug/` (or `rust/target/release/`) to your PumpkinMC `plugins/` directory. 3. Start Pumpkin once to create the `patchbukkit/` directory in your server root, then place your `.jar` plugins in `patchbukkit/patchbukkit-plugins/`. diff --git a/rust/.cargo/config.toml b/rust/.cargo/config.toml index dfa84e8..be01484 100644 --- a/rust/.cargo/config.toml +++ b/rust/.cargo/config.toml @@ -1,2 +1,2 @@ -[unstable] -bindeps = true +# [unstable] +# bindeps = true diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 40e063e..05d127d 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -46,7 +46,7 @@ protoc-bin-vendored = "3" glob = "0.3" [profile.release] -lto = false # LTO is broken on CI cause of a Nightly rustc compiler bug +lto = true [lints.clippy] # Groups diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml index 887e55d..0addaba 100644 --- a/rust/rust-toolchain.toml +++ b/rust/rust-toolchain.toml @@ -1,4 +1,3 @@ [toolchain] -channel = "nightly-2026-08-07" +channel = "stable" components = ["rust-analyzer", "rust-src", "rustfmt", "clippy"] -