diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ad3268b..cb0f4b7 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,68 +1,78 @@ permissions: contents: read -# runs on push to the main branch, and PRs +# runs on push to the master branch, and PRs on: push: - branches: [main] + branches: [master] pull_request: -name: "check" -jobs: +name: check - # 1. formatting +jobs: + # 1. format fmt: name: "stable / fmt" runs-on: ubuntu-latest steps: - name: "checkout" uses: actions/checkout@v3 + with: + submodules: true + - name: "Install stable" uses: dtolnay/rust-toolchain@stable with: components: rustfmt + - name: "cargo fmt --check" run: cargo fmt --check - # 2. clippy lints - clippy: - name: "${{ matrix.toolchain }} / clippy" - runs-on: ubuntu-latest - permissions: - contents: read - checks: write - strategy: - fail-fast: false - matrix: - toolchain: [stable] - # toolchain: [stable, beta] - steps: - - name: "checkout" - uses: actions/checkout@v3 - - name: "Install ${{ matrix.toolchain }}" - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - components: clippy - - name: "cargo clippy" - # NOTE: custom - run: cargo clippy --features=std,use_vendored_bindings + # # 2. clippy lints + # clippy: + # name: "${{ matrix.toolchain }} / clippy" + # runs-on: ubuntu-latest + # permissions: + # contents: read + # checks: write + # strategy: + # fail-fast: false + # matrix: + # toolchain: [stable] + # # toolchain: [stable, beta] + # steps: + # - name: "checkout" + # uses: actions/checkout@v3 + # with: + # submodules: true + # + # - name: "Install ${{ matrix.toolchain }}" + # uses: dtolnay/rust-toolchain@master + # with: + # toolchain: ${{ matrix.toolchain }} + # components: clippy + # + # - name: "cargo clippy" + # run: cargo clippy --features=vendored - # 2. documentation + # 3. documentation doc: + name: "nightly / doc" runs-on: ubuntu-latest - name: nightly / doc steps: - name: "checkout" uses: actions/checkout@v3 + with: + submodules: true + - name: "Install nightly" uses: dtolnay/rust-toolchain@nightly + - name: "cargo doc" - # NOTE: custom - run: cargo doc --features=nightly,std,use_vendored_bindings + run: cargo doc --features=nightly_docs env: RUSTDOCFLAGS: --cfg docsrs - # 4. MSRV + # 4. minimum supported Rust version msrv: name: "ubuntu / ${{ matrix.msrv }}" runs-on: ubuntu-latest @@ -70,15 +80,17 @@ jobs: # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability strategy: matrix: - # NOTE: custom - msrv: [1.64.0] + msrv: [1.65.0] # sync with ../../{readme, Cargo.toml, check.sh} steps: - name: "checkout" uses: actions/checkout@v3 + with: + submodules: true + - name: "Install ${{ matrix.msrv }}" uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.msrv }} + - name: "cargo +${{ matrix.msrv }} check" - # NOTE: custom - run: cargo check --features=std,use_vendored_bindings + run: cargo check --features=vendored diff --git a/.github/workflows/rust-format.yml b/.github/workflows/rust-format.yml deleted file mode 100644 index 5b95753..0000000 --- a/.github/workflows/rust-format.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Rust format - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - uses: icepuma/rust-action@master - with: - args: cargo fmt -- --check - # do not use clippy when using relative local dependencies: - # args: cargo fmt -- --check && cargo clippy -- -Dwarnings diff --git a/Cargo.toml b/Cargo.toml index 8eedbf3..82d814f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "notcurses" version = "3.4.1" edition = "2021" -rust-version = "1.64.0" # keep in sync with .github/workflows/check.yml +rust-version = "1.65.0" # keep in sync with .github/workflows/check.yml authors = ["José Luis Cruz ", "nick black "] license = "MIT OR Apache-2.0" description = "A high level Rust wrapper for the notcurses C library" @@ -32,7 +32,8 @@ nightly_docs = ["vendored"] vendored = ['libnotcurses-sys/use_vendored_bindings'] [dependencies] -libnotcurses-sys = { version = "3.9.1", features = ["std"] } +libnotcurses-sys = { version = "3.10.0", features = ["std"] } +# libnotcurses-sys = { path = "../libnotcurses-sys", features = ["std"] } once_cell = "1.17.0" paste = "1.0.12" diff --git a/README.md b/README.md index 1755b77..b3e293a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Crate](https://img.shields.io/crates/v/notcurses.svg)](https://crates.io/crates/notcurses) [![API](https://docs.rs/notcurses/badge.svg)](https://docs.rs/notcurses/) -[![MSRV: 1.64.0](https://flat.badgen.net/badge/MSRV/1.64.0/purple)](https://releases.rs/docs/released/1.64.0/) +[![MSRV: 1.65.0](https://flat.badgen.net/badge/MSRV/1.65.0/purple)](https://releases.rs/docs/1.65.0/) A rusty wrapper over [notcurses][0], the most blingful TUI library.