Skip to content

Commit

Permalink
Merge pull request #640 from uuid-rs/ci/cleanups
Browse files Browse the repository at this point in the history
CI Cleanups
  • Loading branch information
KodrAus authored Oct 9, 2022
2 parents b87760d + 876e466 commit f5a29cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 74 deletions.
78 changes: 5 additions & 73 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
os:
- macos-10.15
- ubuntu-20.04
- windows-2019
rust_target:
- x86_64-gnu
- x86_64-msvc
Expand Down Expand Up @@ -71,13 +72,8 @@ jobs:
run: cargo hack test --lib --all-features

stable:
name: "Tests / Stable / OS: ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-20.04

name: "Tests / Stable"
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand All @@ -93,13 +89,8 @@ jobs:
run: cargo test --all-features

msrv:
name: "Tests / MSRV / OS: ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-20.04

name: "Tests / MSRV"
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand Down Expand Up @@ -200,62 +191,3 @@ jobs:

- name: Powerset
run: cargo hack check --each-feature -Z avoid-dev-deps
win_tests:
name: "Tests / OS: Windows 2019 - ${{ matrix.channel }}-${{ matrix.rust_target }}"
runs-on: windows-2019
env:
RUSTFLAGS: "--cfg uuid_unstable"
RUSTDOCFLAGS: "--cfg uuid_unstable"
strategy:
matrix:
channel:
- stable
- beta
- nightly
os:
- windows-2019
rust_target:
- x86_64-gnu
- x86_64-msvc
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Install Rust Toolchain
uses: actions-rs/toolchain@v1
with:
override: true
profile: minimal
toolchain: ${{ matrix.channel }}-${{ matrix.rust_target }}

- name: Install cargo-hack
run: cargo install cargo-hack

- name: Docs
run: cargo test --all-features --doc

- name: Examples
run: cargo test --all-features --examples

- name: Each version feature
run: cargo hack test --lib --each-feature --optional-deps $env:DEP_FEATURES

- name: All version features
run: cargo hack test --lib --each-feature --features "$env:VERSION_FEATURES" --optional-deps "$env:DEP_FEATURES"

win-msrv:
name: "Tests / MSRV / OS: Windows 2019"
runs-on: windows-2019
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.57.0
override: true

- name: Version features
run: cargo test --features "$env:VERSION_FEATURES $env:DEP_FEATURES"
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ version = "2"
# Public: Used in trait impls on `Uuid`
[dependencies.arbitrary]
optional = true
version = "=1.1.3"
version = "1.1.3"

# Public (unstable): Used in `zerocopy` derive
# Unstable: also need RUSTFLAGS="--cfg uuid_unstable" to work
Expand Down

0 comments on commit f5a29cf

Please sign in to comment.