Skip to content

Commit

Permalink
Fixes for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Jul 15, 2024
1 parent 801231f commit 2e4269c
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
if: runner.os == 'Linux'
uses: awalsh128/[email protected]
with:
packages: libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
packages: libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev librust-atk-dev
version: 1.0
execute_install_scripts: true

Expand Down Expand Up @@ -152,4 +152,4 @@ jobs:
- name: Download and install Trunk binary
run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
- name: Build
run: ./trunk build
run: cd demo && ../trunk build
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions demo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[package]
name = "demo"
version = "0.1.0"
authors = ["Emil Ernerfeldt <[email protected]>"]
edition = "2021"
include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"]
rust-version = "1.76"
edition.workspace = true
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
license.workspace = true
name = "demo"
publish = false
rust-version.workspace = true
version.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 1 addition & 1 deletion demo/src/plot_demo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ impl CustomAxesDemo {

let time_formatter = |mark: GridMark, _range: &RangeInclusive<f64>| {
let minutes = mark.value;
if minutes < 0.0 || 5.0 * MINS_PER_DAY <= minutes {
if !(0.0..5.0 * MINS_PER_DAY).contains(&minutes) {
// No labels outside value bounds
String::new()
} else if is_approx_integer(minutes / MINS_PER_DAY) {
Expand Down
2 changes: 1 addition & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ deny = [
]

skip = []
skip-tree = []
skip-tree = [{ name = "eframe", reason = "Dev-dependency" }]


[licenses]
Expand Down
16 changes: 8 additions & 8 deletions egui_plot/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[package]
name = "egui_plot"
version.workspace = true
authors = [
"Emil Ernerfeldt <[email protected]>", # https://github.com/emilk
"Jan Haller <[email protected]>", # https://github.com/Bromeon
"Sven Niederberger <[email protected]>", # https://github.com/EmbersArc
]
categories = ["visualization", "gui"]
description = "Immediate mode plotting for the egui GUI library"
edition.workspace = true
rust-version.workspace = true
homepage = "https://github.com/emilk/egui"
homepage = "https://github.com/emilk/egui_plot"
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
keywords = ["egui", "plot", "plotting"]
license.workspace = true
name = "egui_plot"
readme = "README.md"
repository = "https://github.com/emilk/egui"
categories = ["visualization", "gui"]
keywords = ["egui", "plot", "plotting"]
include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
repository = "https://github.com/emilk/egui_plot"
rust-version.workspace = true
version.workspace = true

[lints]
workspace = true
Expand Down
1 change: 1 addition & 0 deletions egui_plot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ impl<'a> Plot<'a> {
}

#[allow(clippy::too_many_lines)] // TODO(emilk): shorten this function
#[allow(clippy::type_complexity)] // build_fn
fn show_dyn<R>(
self,
ui: &mut Ui,
Expand Down

0 comments on commit 2e4269c

Please sign in to comment.