diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml deleted file mode 100644 index 8fd8458..0000000 --- a/.github/workflows/audit.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Security audit -on: - schedule: - - cron: '0 0 * * *' -jobs: - audit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/audit-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml deleted file mode 100644 index c444281..0000000 --- a/.github/workflows/check.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: PR feedback -on: - pull_request: - -jobs: - clippy: - strategy: - matrix: - platform: - - macos - - ubuntu - - windows - - name: "Clippy on ${{ matrix.platform }}" - runs-on: "${{ matrix.platform }}-latest" - - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - default: true - - - run: rustup component add clippy - - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --features with-tokio - - fmt-check: - name: Check formatting - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --check diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index e631eb4..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Main branch -on: - push: - branches: - - main - -jobs: - check: - strategy: - matrix: - platform: - - macos - - ubuntu - - windows - features: - - default - - with-tokio - - name: "Check on ${{ matrix.platform }} (feat: ${{ matrix.features }})" - runs-on: "${{ matrix.platform }}-latest" - - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - default: true - - uses: actions-rs/cargo@v1 - with: - command: check - args: --features ${{ matrix.features }} diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml deleted file mode 100644 index 99b77ef..0000000 --- a/.github/workflows/merge.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Merge (with Bors) -on: - push: - branches: - - staging - - trying - -jobs: - check: - strategy: - matrix: - platform: - - macos - - ubuntu - - windows - toolchain: - - stable - - 1.60.0 - features: - - default - - with-tokio - - name: "Test on ${{ matrix.platform }} with Rust ${{ matrix.toolchain }} (feat: ${{ matrix.features }})" - runs-on: "${{ matrix.platform }}-latest" - - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: "${{ matrix.toolchain }}" - default: true - - - uses: actions-rs/cargo@v1 - with: - command: test - args: --features ${{ matrix.features }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..18959b6 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,62 @@ +name: Test +on: + pull_request: + push: + branches: + - main + +jobs: + test: + strategy: + fail-fast: false + matrix: + platform: + - macos + - ubuntu + - windows + toolchain: + - stable + - 1.60.0 + features: + - default + - with-tokio + + name: "Test on ${{ matrix.platform }} with Rust ${{ matrix.toolchain }} (feat: ${{ matrix.features }})" + runs-on: "${{ matrix.platform }}-latest" + + steps: + - uses: actions/checkout@v3 + + - name: Configure Rust + run: | + rustup toolchain install --profile minimal --no-self-update ${{ matrix.toolchain }} + rustup default ${{ matrix.toolchain }} + rustup component add clippy + + - name: Configure caching + uses: actions/cache@v3 + with: + path: | + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }} + + - run: cargo test --features ${{ matrix.features }} + - run: cargo clippy --features ${{ matrix.features }} + + formatting: + name: Fmt check + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Configure Rust + run: | + rustup toolchain install --profile minimal --no-self-update stable + rustup default stable + + - run: cargo fmt --check + diff --git a/CHANGELOG.md b/CHANGELOG.md index 34a6bec..26dcbb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Next (YYYY-MM-DD) -- Add BORS. +- Increase MSRV to 1.60.0 and change policy for increasing it (no longer a breaking change). ## v1.0.8 (2021-10-16) diff --git a/README.md b/README.md index 01338ab..14b8890 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Crate release version](https://flat.badgen.net/crates/v/command-group)](https://crates.io/crates/command-group) [![Crate license: Apache 2.0 or MIT](https://flat.badgen.net/badge/license/Apache%202.0%20or%20MIT)][copyright] -[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/45673) [![CI status on main branch](https://github.com/watchexec/command-group/actions/workflows/main.yml/badge.svg)](https://github.com/watchexec/command-group/actions/workflows/main.yml) # Command Group @@ -10,7 +9,8 @@ _Extension to [`Command`](https://doc.rust-lang.org/std/process/struct.Command.h - **[API documentation][docs]**. - [Dual-licensed][copyright] with Apache 2.0 and MIT. - Minimum Supported Rust Version: 1.60.0. - - This is set as: 5 versions before stable, at the time of publish. + - Only the last five stable versions are supported. + - MSRV increases within that range at publish time will not incur major version bumps. [caretaker]: ./CARETAKERS.md [copyright]: ./COPYRIGHT diff --git a/bors.toml b/bors.toml deleted file mode 100644 index e61961c..0000000 --- a/bors.toml +++ /dev/null @@ -1,29 +0,0 @@ -delete_merged_branches = true -update_base_for_deletes = true - -status = [ - "Test on macos with Rust stable (feat: default)", - "Test on ubuntu with Rust stable (feat: default)", - "Test on windows with Rust stable (feat: default)", - "Test on macos with Rust 1.51.0 (feat: default)", - "Test on ubuntu with Rust 1.51.0 (feat: default)", - "Test on windows with Rust 1.51.0 (feat: default)", - - "Test on macos with Rust stable (feat: with-tokio)", - "Test on ubuntu with Rust stable (feat: with-tokio)", - "Test on windows with Rust stable (feat: with-tokio)", - "Test on macos with Rust 1.51.0 (feat: with-tokio)", - "Test on ubuntu with Rust 1.51.0 (feat: with-tokio)", - "Test on windows with Rust 1.51.0 (feat: with-tokio)", -] - -# Disabled until https://github.com/bors-ng/bors-ng/issues/1434 is fixed -#pr_status = [ -# "Clippy on macos (feat: default)", -# "Clippy on ubuntu (feat: default)", -# "Clippy on windows (feat: default)", -# -# "Clippy on macos (feat: with-tokio)", -# "Clippy on ubuntu (feat: with-tokio)", -# "Clippy on windows (feat: with-tokio)", -#]