Merge pull request #721 from ClementTsang/remove_cache_from_fmt

Removes the caching step from the cargo fmt check as it does nothing. Also adds an extra test for if the battery feature is disabled.
This commit is contained in:
Clement Tsang 2022-05-01 17:40:22 -04:00 committed by GitHub
commit 2629709c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions

View File

@ -54,9 +54,6 @@ jobs:
override: true override: true
components: rustfmt components: rustfmt
- uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # 1.4.0
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
- run: cargo fmt --all -- --check - run: cargo fmt --all -- --check
if: ${{ steps.skip_check.outputs.should_skip != 'true' }} if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
@ -87,7 +84,7 @@ jobs:
features: [ features: [
"--all-features", "--all-features",
# "--features battery", # "--features battery",
# "--features gpu", # Think it's fine to skip this specific test. # "--features gpu",
"--no-default-features", "--no-default-features",
] ]
steps: steps:
@ -130,7 +127,7 @@ jobs:
- name: Run clippy - name: Run clippy
if: ${{ steps.skip_check.outputs.should_skip != 'true' }} if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
run: cargo clippy ${{ matrix.features }} --workspace -- -D warnings run: cargo clippy ${{ matrix.features }} --all-targets --workspace -- -D warnings
# Run cargo check on all other platforms # Run cargo check on all other platforms
other_check: other_check:
@ -265,5 +262,5 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: check command: check
args: --all-targets --verbose --target=${{ matrix.triple.target }} --features "battery" --locked args: --all-targets --verbose --target=${{ matrix.triple.target }} --locked
use-cross: ${{ matrix.triple.cross }} use-cross: ${{ matrix.triple.cross }}

View File

@ -149,7 +149,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --verbose --locked --target=${{ matrix.triple.target }} --features "battery" args: --release --verbose --locked --target=${{ matrix.triple.target }} --features deploy
use-cross: ${{ matrix.triple.cross }} use-cross: ${{ matrix.triple.cross }}
- name: Build autocompletion and manpage - name: Build autocompletion and manpage
@ -317,7 +317,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --locked --verbose --features "battery" args: --release --locked --verbose --features deploy
- name: Build autocompletion and manpage - name: Build autocompletion and manpage
shell: bash shell: bash

View File

@ -145,7 +145,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --locked --verbose --target=${{ matrix.triple.target }} --features "battery" args: --release --locked --verbose --target=${{ matrix.triple.target }} --features deploy
use-cross: ${{ matrix.triple.cross }} use-cross: ${{ matrix.triple.cross }}
- name: Build autocompletion and manpage - name: Build autocompletion and manpage
@ -311,7 +311,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --locked --verbose --features "battery" args: --release --locked --verbose --features deploy
- name: Build autocompletion and manpage - name: Build autocompletion and manpage
shell: bash shell: bash

View File

@ -32,6 +32,7 @@ strip = "symbols"
[features] [features]
default = ["fern", "log", "battery", "gpu"] default = ["fern", "log", "battery", "gpu"]
deploy = ["battery", "gpu"]
gpu = ["nvidia"] gpu = ["nvidia"]
nvidia = ["nvml-wrapper"] nvidia = ["nvml-wrapper"]