Skip to content

Commit

Permalink
Bump msrv and policy
Browse files Browse the repository at this point in the history
  • Loading branch information
passcod committed Dec 3, 2022
1 parent 2d0a305 commit 7cc1530
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 40 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
clippy:
strategy:
matrix:
include:
- platform: macos
- platform: ubuntu
- platform: windows
platform:
- macos
- ubuntu
- windows

name: "Clippy on ${{ matrix.platform }}"
runs-on: "${{ matrix.platform }}-latest"
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@ jobs:
check:
strategy:
matrix:
include:
- platform: macos
features: default
- platform: macos
features: with-tokio
- platform: ubuntu
features: default
- platform: ubuntu
features: with-tokio
- platform: windows
features: default
- platform: windows
features: with-tokio
platform:
- macos
- ubuntu
- windows
features:
- default
- with-tokio

name: "Check on ${{ matrix.platform }} (feat: ${{ matrix.features }})"
runs-on: "${{ matrix.platform }}-latest"
Expand Down
34 changes: 13 additions & 21 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
name: Try this
name: Merge (with Bors)
on:
pull_request:
push:
branches:
- staging
- trying

jobs:
check:
strategy:
fail-fast: false
matrix:
platform: [macos]
features:
- default
- with-tokio
platform:
- macos
- ubuntu
- windows
toolchain:
- stable
- 1.51.0
- 1.52.0
- 1.53.0
- 1.54.0
- 1.55.0
- 1.56.0
- 1.57.0
- 1.58.0
- 1.59.0
- 1.60.0
- 1.61.0
- 1.62.0
- 1.63.0
- 1.64.0
- 1.65.0
features:
- default
- with-tokio

name: "Test on ${{ matrix.platform }} with Rust ${{ matrix.toolchain }} (feat: ${{ matrix.features }})"
runs-on: "${{ matrix.platform }}-latest"

Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ homepage = "https://github.com/watchexec/command-group"
repository = "https://github.com/watchexec/command-group"
readme = "README.md"

edition = "2018"
edition = "2021"
exclude = ["/bin", "/.github"]
rust-version = "1.60.0"

[dependencies]
async-trait = { version = "0.1.50", optional = true }
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,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.51.0.
- Minimum Supported Rust Version: 1.60.0.
- This is set as: 5 versions before stable, at the time of publish.

[caretaker]: ./CARETAKERS.md
[copyright]: ./COPYRIGHT
Expand Down

0 comments on commit 7cc1530

Please sign in to comment.