From 6a246cf4adee23241d1fef32a9e669e42ec515d3 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Tue, 28 Jan 2025 02:23:27 +0100 Subject: [PATCH] ci: add -j4 --- .forgejo/workflows/build.yaml | 2 +- Justfile | 2 +- tek/src/view_output.rs | 4 ++-- tek/src/view_scene.rs | 27 ++++++++++++++------------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a7715bd7..c66a817e 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -7,5 +7,5 @@ jobs: - run: nix-channel --list && nix-channel --update - run: nix-shell -p git --command 'git clone --recursive $GITHUB_SERVER_URL/$GITHUB_REPOSITORY .' - run: whoami && pwd && ls -al - - run: nix-shell --command 'cloc src/ && cloc . && rustup install nightly && cargo version -vv && just cov && cargo doc && cargo build --release' .forgejo/workflows/build.nix + - run: nix-shell --command 'cloc src/ && cloc . && rustup install nightly && cargo version -vv && just cov && cargo doc -j4 && cargo build -j4 --release' .forgejo/workflows/build.nix #- run: nix-shell -p docker --command "docker run --security-opt seccomp=unconfined -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin --out Html --all-features" diff --git a/Justfile b/Justfile index 0887febd..071703c8 100644 --- a/Justfile +++ b/Justfile @@ -24,7 +24,7 @@ doc: covfig := "CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' RUSTDOCFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='cov/cargo-test-%p-%m.profraw'" cov: rm -rf target/coverage/html || true - {{covfig}} time cargo test --workspace --exclude jack --profile coverage + {{covfig}} time cargo test -j4 --workspace --exclude jack --profile coverage {{covfig}} time grcov . --binary-path ./target/coverage/deps/ -s . -t html --ignore-not-existing --ignore '../*' --ignore "/*" --ignore 'target/*' -o target/coverage/html llcov: time cargo llvm-cov --workspace --exclude jack --profile coverage --no-report diff --git a/tek/src/view_output.rs b/tek/src/view_output.rs index e6e8ed61..64fd766b 100644 --- a/tek/src/view_output.rs +++ b/tek/src/view_output.rs @@ -11,9 +11,9 @@ impl Tek { .map(|clip|clip.read().unwrap().name.clone())) .flatten().as_ref()))), Thunk::new(||Tui::bg(Reset, " ------ ")))); - let nexts = self.row_top(w, 1, Align::e("Next:"), nexts, ()); + let nexts = self.row_top(w, 2, Align::ne("Next:"), nexts, ()); let froms = self.per_track_top(|_, _|Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default(),)))); - let froms = self.row_top(w, 2, Align::e("From:"), froms, ()); + let froms = self.row_top(w, 2, Align::ne("From:"), froms, ()); let ports = self.row_top(w, 1, self.button3("o", "midi outs", format!("{}", self.midi_outs.len())), self.per_track_top(move|t, track|{ diff --git a/tek/src/view_scene.rs b/tek/src/view_scene.rs index 5fc6c159..531d9ab9 100644 --- a/tek/src/view_scene.rs +++ b/tek/src/view_scene.rs @@ -3,8 +3,7 @@ impl Tek { const H_SCENE: usize = 2; const H_EDITOR: usize = 15; pub(crate) fn h_scenes (&self, editing: bool, height: usize, larger: usize) -> u16 { - self.scenes_sizes(editing, height, larger).last().map(|(_, _, _, y)|y as u16).unwrap_or(0) - } + self.scenes_sizes(editing, height, larger).last().map(|(_, _, _, y)|y as u16).unwrap_or(0) } pub(crate) fn scenes_sizes (&self, editing: bool, height: usize, larger: usize) -> impl ScenesSizes<'_> { let (selected_track, selected_scene) = match self.selected() { Selection::Track(t) => (Some(*t), None), @@ -27,17 +26,19 @@ impl Tek { let selected_track = self.selected().track(); let selected_scene = self.selected().scene(); let h = self.h_scenes(editing, Self::H_SCENE, Self::H_EDITOR); - let scene_names = Map::new( - move||self.scenes_with_colors(editing, h_area), - move|(s, scene, y1, y2, prev): SceneColor, _|self.view_scene_name( - w_full, (1 + y2 - y1) as u16, y1 as u16, s, scene, prev)); - let scene_clips = self.per_track(move|t, track|Map::new( - move||self.scenes_with_track_colors(editing, h_area, t), - move|(s, scene, y1, y2, prev): SceneColor, _|self.view_scene_clip( - w, (1 + y2 - y1) as u16, y1 as u16, - scene, prev, s, t, editing, selected_track == Some(t), selected_scene))); - Tui::bg(Reset, Fixed::y(self.h_tracks_area(), - self.row(self.w_tracks_area(), h, scene_names, scene_clips, ()))) } + let scrollbar = Fill::y(Fixed::x(1, RepeatV(" "))); + Tui::bg(Reset, Fixed::y(self.h_tracks_area(), self.row(self.w_tracks_area(), h, + Bsp::e(scrollbar, Map::new( + move||self.scenes_with_colors(editing, h_area), + move|(s, scene, y1, y2, prev): SceneColor, _|self.view_scene_name( + w_full, (1 + y2 - y1) as u16, y1 as u16, s, scene, prev))), + self.per_track(move|t, track|Map::new( + move||self.scenes_with_track_colors(editing, h_area, t), + move|(s, scene, y1, y2, prev): SceneColor, _|self.view_scene_clip( + w, (1 + y2 - y1) as u16, y1 as u16, + scene, prev, s, t, editing, selected_track == Some(t), selected_scene))), + (), + ))) } fn scenes_with_colors (&self, editing: bool, h: u16) -> impl ScenesColors<'_> { self.scenes_sizes(editing, Self::H_SCENE, Self::H_EDITOR).map_while( move|(s, scene, y1, y2)|if y2 as u16 > h {