From d8d5ae7af2490786bd090d5ed5b7dab0b2299093 Mon Sep 17 00:00:00 2001 From: Yuekai Jia Date: Thu, 11 Jul 2024 11:36:29 +0800 Subject: [PATCH] Update rust-toolchain to stable --- .github/workflows/deploy.yml | 6 +++--- .github/workflows/main.yml | 33 +++++++++++---------------------- Cargo.toml | 4 ++-- rust-toolchain | 2 +- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b26a792..78ab721 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable profile: minimal components: rust-src - name: Build docs @@ -30,7 +30,7 @@ jobs: cargo doc --target ${target} mv target/${target}/doc doc/${target} done - for target in x86_64-unknown-linux-gnu + for target in x86_64-unknown-linux-gnu do rustup target add ${target} cargo doc --target ${target} @@ -38,7 +38,7 @@ jobs: mv target/${target}/doc doc/${target} done - name: Deploy to Github Pages - uses: JamesIves/github-pages-deploy-action@releases/v3 + uses: JamesIves/github-pages-deploy-action@releases/v4 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: gh-pages diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3d4021..39cc5d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,15 +4,12 @@ on: [push, pull_request] jobs: check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - run: rm rust-toolchain + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-01-20 - override: true components: rustfmt, clippy - name: Check code format uses: actions-rs/cargo@v1 @@ -21,7 +18,7 @@ jobs: args: --all -- --check build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: target: [ @@ -31,14 +28,13 @@ jobs: aarch64-unknown-none-softfloat, riscv32imac-unknown-none-elf, riscv64imac-unknown-none-elf, - mipsel-unknown-linux-gnu, + mipsel-unknown-none, ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-01-20 target: ${{ matrix.target }} components: clippy - name: Build @@ -58,13 +54,12 @@ jobs: args: --target ${{ matrix.target }} build-x86_64-none: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-01-20 components: rust-src - name: Build uses: actions-rs/cargo@v1 @@ -81,15 +76,12 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-latest] + os: [ubuntu-latest, macos-latest] steps: - - uses: actions/checkout@v2 - - run: rm rust-toolchain + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-01-20 - override: true - name: Test uses: actions-rs/cargo@v1 with: @@ -97,16 +89,13 @@ jobs: args: --all-features test-aarch64: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - run: rm rust-toolchain + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-01-20 target: aarch64-unknown-linux-gnu - override: true - uses: actions-rs/cargo@v1 with: use-cross: true diff --git a/Cargo.toml b/Cargo.toml index 554edbb..9a221ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ exclude = ["docs", ".idea"] [dependencies] [target.'cfg(target_arch = "x86_64")'.dependencies] -x86_64 = "0.14.8" -raw-cpuid = "10" +x86_64 = "0.15" +raw-cpuid = "11.0" [features] default = [] diff --git a/rust-toolchain b/rust-toolchain index 12ae469..bf867e0 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2022-01-20 \ No newline at end of file +nightly