Skip to content

Get CI passing again #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CosmicHorrorDev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Get CI passing again #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9d20fb
docs: Bump MSRV 1.57 -> 1.60
CosmicHorrorDev Nov 14, 2024
9130db9
ci: Only build/test with default features for MSRV
CosmicHorrorDev Nov 14, 2024
dd09d10
ci: Move linting into the build job
CosmicHorrorDev Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 34 additions & 19 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,32 @@
on: [push, pull_request]
name: CI
jobs:
clippy_rustfmt:
name: Lint & Format
rustfmt:
name: Formatting
runs-on: ubuntu-latest
strategy:
matrix:
features:
- default
- ssl-openssl
- ssl-rustls
- ssl-native-tls
steps:
- uses: actions/checkout@v2
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt, clippy

- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --features ${{ matrix.features }}
override: true
components: rustfmt

- name: Format
uses: actions-rs/cargo@v1
with:
command: fmt
args: -- --check

test:
name: Build & Test
build_test_lint:
name: Build, Test, and Lints
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- stable
- nightly
- 1.57
features:
- default
- ssl-openssl
Expand All @@ -52,6 +39,7 @@ jobs:
with:
toolchain: ${{ matrix.rust }}
override: true
components: clippy

- name: Build
uses: actions-rs/cargo@v1
Expand All @@ -64,3 +52,30 @@ jobs:
with:
command: test
args: --features ${{ matrix.features }}

- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --features ${{ matrix.features }}

msrv_build:
name: Build & Test on MSRV
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: "1.60"
override: true

- name: Build
uses: actions-rs/cargo@v1
with:
command: build

- name: Test
uses: actions-rs/cargo@v1
with:
command: test
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["http", "server", "web"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/tiny-http/tiny-http"
edition = "2018"
rust-version = "1.57"
rust-version = "1.60"

[features]
default = ["log"]
Expand Down