Skip to content

Commit

Permalink
Update Marker to v0.5.0 🎄
Browse files Browse the repository at this point in the history
Co-authored-by: Veetaha <gersoh3@gmail.com>
  • Loading branch information
xFrednet and Veetaha committed Dec 28, 2023
1 parent 88fd3ac commit f96dd52
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 15 deletions.
34 changes: 23 additions & 11 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
on:
push:
pull_request:
push:
branches:
- master

defaults:
run:
Expand All @@ -10,38 +12,48 @@ env:
RUST_BACKTRACE: 1
CARGO_TERM_COLOR: always
# Make sure rustc errors on warnings in the CI
RUSTFLAGS: "-Dwarnings"
RUSTFLAGS: -Dwarnings

jobs:
rust-test:
cargo-marker:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: rust-marker/marker@v0.5

cargo-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
# Marker is required for UI tests
- uses: rust-marker/marker@v0.4
- uses: rust-marker/marker@v0.5
with:
install-only: true
- run: cargo test

rust-formatting:
rust-fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --check

rust-lint:
rust-clippy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: rust-marker/marker@v0.4
with:
install-only: true

- run: cargo clippy --all-features --all-targets
- run: cargo doc --no-deps
- run: cargo marker -- --all-features --all-targets

cargo-doc:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo doc --all-features --no-deps
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
marker_api = "0.4"
marker_utils = "0.4"
marker_api = "0.5"
marker_utils = "0.5"

[dev-dependencies]
marker_uitest = "0.4"
marker_uitest = "0.5"

[[test]]
name = "uitest"
harness = false

[workspace.metadata.marker.lints]
marker_lints = "0.4"
marker_lints = "0.5"

0 comments on commit f96dd52

Please sign in to comment.