Skip to content
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.

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

Bump Marker v0.3.0 and update CI #5

Merged
merged 1 commit into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto eol=lf
*.rs text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
*.fixed linguist-language=Rust
71 changes: 43 additions & 28 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
on:
push:
# Don't run tests, when only text files were modified
paths-ignore:
- 'COPYRIGHT'
- 'LICENSE-*'
- '**.md'
- '**.txt'
pull_request:
# Don't run tests, when only text files were modified
paths-ignore:
- 'COPYRIGHT'
- 'LICENSE-*'
- '**.md'
- '**.txt'

defaults:
run:
shell: bash

env:
RUST_BACKTRACE: 1
Expand All @@ -21,22 +13,45 @@ env:
RUSTFLAGS: "-Dwarnings"

jobs:
rust:
rust-test:
runs-on: ${{ matrix.os }}-latest

strategy:
matrix:
os: [ubuntu, windows, macos]

steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
# Marker is required for UI tests
- uses: rust-marker/[email protected]
with:
install-only: true

- run: cargo test --locked

rust-formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
# rustfmt, might change some formatting between versions. This check should
# use the toolchain version from `rust-toolchain.toml` since that is also the
# version invoked during normal development in the repo. The formatting
# shouldn't matter for consumers of Marker. Therefore it's safe to use the
# nightly version of rustfmt
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --check

rust-lint:
runs-on: ubuntu-latest

# Setup
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-07-13
components: cargo, clippy, rustfmt, rustc, rustc-dev, llvm-tools
- run: rustc -vV
- run: cargo install cargo_marker --version 0.2.1
- run: cargo marker setup

# Tests
- run: cargo test
- run: cargo clippy
- run: cargo fmt --check
- run: cargo marker
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: rust-marker/[email protected]
with:
install-only: true

- run: cargo clippy --all-features --all-targets --locked
- run: cargo doc --no-deps
- run: cargo marker -- --all-features --all-targets --locked
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/target
/Cargo.lock
Loading