Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Combine MSRV-check with -Zminimal-versions build #212

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 9 additions & 42 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,24 @@ jobs:
sudo apt-get install -y libdrm-dev
- name: Fetch drm headers
run: ./.github/workflows/fetch_headers.sh
- name: Update deps
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
profile: minimal
default: true
override: true
- name: Generate minimal-versions lockfile
uses: actions-rs/cargo@v1
with:
command: update
command: generate-lockfile
args: -Z minimal-versions
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.66.0
profile: minimal
components: clippy
default: true
override: true
- name: Downgrade home
run: cargo update -p home --precise 0.5.5
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -100,43 +105,6 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all --all-features --all-targets -- -D warnings -A clippy::redundant_static_lifetimes

check-minimal:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- run: |
sudo apt-get update -y
sudo apt-get install -y libdrm-dev
- name: Fetch drm headers
run: ./.github/workflows/fetch_headers.sh
- name: Update deps
uses: actions-rs/cargo@v1
with:
command: update
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
profile: minimal
default: true
override: true
- name: Cargo cache
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-rust_nightly-${{ hashFiles('**/Cargo.toml') }}
- name: Build cache
uses: actions/cache@v3
with:
path: target
key: ${{ runner.os }}-build-rust_nightly-check-minimal-${{ hashFiles('**/Cargo.toml') }}
- name: Check
uses: actions-rs/cargo@v1
with:
command: check
args: --all --all-features --all-targets -Z minimal-versions

test:
needs:
- format
Expand Down Expand Up @@ -310,7 +278,6 @@ jobs:
- format
- doc
- check
- check-minimal
- test
runs-on: ubuntu-22.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion drm-ffi/drm-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use_bindgen = ["bindgen", "pkg-config"]
update_bindings = ["use_bindgen"]

[build-dependencies]
bindgen = { version = "0.69.1", optional = true }
bindgen = { version = "0.69.3", optional = true }
pkg-config = { version = "0.3.19", optional = true }

[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
Expand Down
Loading