Skip to content

Commit

Permalink
bump libnotcurses-sys; bump MSRV to 1.65.0
Browse files Browse the repository at this point in the history
- update CI.
  • Loading branch information
joseluis committed Sep 8, 2023
1 parent a3d3416 commit aeb9ede
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 55 deletions.
86 changes: 49 additions & 37 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,84 +1,96 @@
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
# we use a matrix here just because env can't be used in job names
# 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
15 changes: 0 additions & 15 deletions .github/workflows/rust-format.yml

This file was deleted.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>", "nick black <[email protected]>"]
license = "MIT OR Apache-2.0"
description = "A high level Rust wrapper for the notcurses C library"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down

0 comments on commit aeb9ede

Please sign in to comment.