Skip to content

Commit

Permalink
ci: install cargo tools with newer toolchain
Browse files Browse the repository at this point in the history
Signed-off-by: Jiaqi Gao <[email protected]>
  • Loading branch information
gaojiaqi7 committed Dec 5, 2024
1 parent cc7099b commit 50ed95c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env:
AS: nasm
AR: llvm-ar
CC: clang
RUSTUP_TOOLCHAIN: 1.78.0

permissions:
contents: read
Expand Down Expand Up @@ -34,14 +35,14 @@ jobs:
- name: install NASM
uses: ilammy/setup-nasm@13cbeb366c45c4379d3478cdcbadd8295feb5028 # v1.5.1

- name: Install toolchain with clippy available
- name: install stable rust toolchain
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
with:
toolchain: 1.78.0
profile: minimal
toolchain: nightly-2023-12-31
override: true
components: clippy

- name: Install required cargo
run: cargo install clippy-sarif sarif-fmt

Expand Down Expand Up @@ -88,7 +89,7 @@ jobs:
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
with:
profile: minimal
toolchain: nightly-2023-12-31
toolchain: 1.78.0
override: true
components: rustfmt

Expand Down
23 changes: 7 additions & 16 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
AS: nasm
AR_x86_64_unknown_none: llvm-ar
CC_x86_64_unknown_none: clang
RUST_TOOLCHAIN: nightly-2023-12-31
RUSTUP_TOOLCHAIN: 1.78.0
TOOLCHAIN_PROFILE: minimal
AFL_NO_AFFINITY: 1

Expand All @@ -33,34 +33,25 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
submodules: recursive

- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
with:
toolchain: nightly-2023-12-31
toolchain: 1.78.0
profile: minimal
override: true
components: rust-src, llvm-tools-preview

- name: Run cargo install cargo-xbuild
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
with:
command: install
args: cargo-xbuild
run: cargo install cargo-xbuild

- name: install NASM
uses: ilammy/setup-nasm@13cbeb366c45c4379d3478cdcbadd8295feb5028 # v1.5.1

- name: Install AFL
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
with:
command: install
args: cargo-afl
run: cargo install cargo-afl

- name: Install Cargo-Fuzz
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
with:
command: install
args: cargo-fuzz

run: cargo install cargo-fuzz

- name: Preparation work
run: bash sh_script/preparation.sh

Expand Down

0 comments on commit 50ed95c

Please sign in to comment.