Skip to content

Commit

Permalink
Update rust-toolchain to stable
Browse files Browse the repository at this point in the history
  • Loading branch information
equation314 committed Jul 11, 2024
1 parent 72a1a72 commit 3625dd4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,15 +30,15 @@ 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}
cargo doc --target ${target} -Z build-std=core,alloc
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
Expand Down
31 changes: 10 additions & 21 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,7 +18,7 @@ jobs:
args: --all -- --check

build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
target: [
Expand All @@ -34,11 +31,10 @@ jobs:
mipsel-unknown-linux-gnu,
]
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
Expand All @@ -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
Expand All @@ -81,32 +76,26 @@ 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:
command: test
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
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2022-01-20
nightly
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![no_std]
#![feature(linkage)]
#![deny(warnings)]
#![cfg_attr(target_arch = "mips", feature(asm_experimental_arch))]

Expand Down

0 comments on commit 3625dd4

Please sign in to comment.