From 6944c0d3f01260fe1bc291d34b37b30b64854c79 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Sun, 9 Oct 2022 13:39:28 +1000 Subject: [PATCH 1/2] simplify CI and unpin arbitrary --- .github/workflows/ci.yml | 74 ++-------------------------------------- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 72 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb2e9994..12d97879 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,7 @@ jobs: os: - macos-10.15 - ubuntu-20.04 + - windows-2019 rust_target: - x86_64-gnu - x86_64-msvc @@ -72,12 +73,7 @@ jobs: stable: name: "Tests / Stable / OS: ${{ matrix.os }}" - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: - - ubuntu-20.04 - + runs-on: ubuntu-20.04 steps: - name: Checkout sources uses: actions/checkout@v2 @@ -94,12 +90,7 @@ jobs: msrv: name: "Tests / MSRV / OS: ${{ matrix.os }}" - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: - - ubuntu-20.04 - + runs-on: ubuntu-20.04 steps: - name: Checkout sources uses: actions/checkout@v2 @@ -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" diff --git a/Cargo.toml b/Cargo.toml index af314636..5828bfc7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 From 876e466f1db4bf37bf4ee5c67f56752ca720956b Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Sun, 9 Oct 2022 13:42:00 +1000 Subject: [PATCH 2/2] remove missing moniker from job names --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12d97879..a6fabeb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: run: cargo hack test --lib --all-features stable: - name: "Tests / Stable / OS: ${{ matrix.os }}" + name: "Tests / Stable" runs-on: ubuntu-20.04 steps: - name: Checkout sources @@ -89,7 +89,7 @@ jobs: run: cargo test --all-features msrv: - name: "Tests / MSRV / OS: ${{ matrix.os }}" + name: "Tests / MSRV" runs-on: ubuntu-20.04 steps: - name: Checkout sources