Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #521 from cgwalters/bump-msrv
Browse files Browse the repository at this point in the history
Bump rust-version = 1.70 && ci: Drop hard errors on clippy warnings by default
  • Loading branch information
cgwalters authored Aug 28, 2023
2 parents e737c85 + 7650946 commit 46fe6df
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
25 changes: 4 additions & 21 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ on:

env:
CARGO_TERM_COLOR: always
# Pinned toolchain for linting
ACTION_LINTS_TOOLCHAIN: 1.64.0

jobs:
tests:
Expand All @@ -33,6 +31,8 @@ jobs:
uses: Swatinem/rust-cache@v2
with:
key: "tests"
- name: cargo fmt (check)
run: cargo fmt -- --check -l
- name: Build
run: cargo test --no-run
- name: Individual checks
Expand All @@ -41,6 +41,8 @@ jobs:
run: cargo test -- --nocapture --quiet
- name: Manpage generation
run: mkdir -p target/man && cargo run --features=docgen -- man --directory target/man
# - name: cargo clippy
# run: cargo clippy
build:
runs-on: ubuntu-latest
container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
Expand Down Expand Up @@ -94,25 +96,6 @@ jobs:
with:
log-level: warn
command: check bans sources licenses
linting:
name: "Lints, pinned toolchain"
runs-on: ubuntu-latest
container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install deps
run: ./ci/installdeps.sh
- name: Remove system Rust toolchain
run: dnf remove -y rust cargo
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env['ACTION_LINTS_TOOLCHAIN'] }}
components: rustfmt, clippy
- name: cargo fmt (check)
run: cargo fmt -- --check -l
- name: cargo clippy (warnings)
run: cargo clippy -- -D warnings
integration:
name: "Integration"
needs: build
Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
repository = "https://github.com/ostreedev/ostree-rs-ext"
readme = "README.md"
publish = false
rust-version = "1.64.0"
rust-version = "1.70.0"

[dependencies]
anyhow = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "ostree-ext"
readme = "README.md"
repository = "https://github.com/ostreedev/ostree-rs-ext"
version = "0.11.5"
rust-version = "1.64.0"
rust-version = "1.70.0"

[dependencies]
anyhow = "1.0"
Expand Down

0 comments on commit 46fe6df

Please sign in to comment.