Skip to content

Commit

Permalink
Fixed a CSV error. Added a new test
Browse files Browse the repository at this point in the history
  • Loading branch information
subalterngames committed May 4, 2024
1 parent da9e964 commit e53ebd3
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.74.0
toolchain: stable
- name: cargo build
run: cargo build --release --features ${{ matrix.feature }}
- name: Create release directory
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.74.0
toolchain: stable
- name: Install cargo bundle
run: cargo install cargo-bundle
- name: cargo build
Expand All @@ -92,7 +92,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.74.0
toolchain: stable
- name: cargo build
run: cargo build --release
- name: Download butler
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: test

on:
push:
branches-ignore:
- main
paths-ignore:
- "doc/**"
- ".vscode/**"
Expand Down
70 changes: 70 additions & 0 deletions .github/workflows/test_build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Build and run

on:
push:
branches-ignore:
- main
paths-ignore:
- "doc/**"
- ".vscode/**"
- "html/**"
- "data/**"
- "promo/**"
- "py/**"
- "**.md"
jobs:
ubuntu:
strategy:
matrix:
include:
- os: ubuntu-20.04
version: 20
feature: speech_dispatcher_0_9
- os: ubuntu-22.04
version: 22
feature: speech_dispatcher_0_11
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: apt update
run: sudo apt-get update
- name: install
run: sudo apt install clang libspeechd-dev pkg-config libssl-dev alsa librust-alsa-sys-dev
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- name: Run and quit
run: cargo run --release --features ${{ matrix.feature }} -- -q
macos:
strategy:
matrix:
include:
- os: macos-11
version: 11
- os: macos-12
version: 12
- os: macos-13
version: 13
- os: macos-14
version: 14
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- name: Run and quit
run: cargo run --release -- -q
windows:
name: Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- name: Run and quit
run: cargo run --release -- -q
14 changes: 7 additions & 7 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
members = ["audio", "common", "input", "io", "render", "text"]

[workspace.package]
version = "0.2.3"
version = "0.2.4"
authors = ["Esther Alter <subalterngames@gmail.com>"]
description = "A minimalist and ergonomic MIDI sequencer"
documentation = "https://github.com/subalterngames/cacophony"
Expand Down Expand Up @@ -86,7 +86,7 @@ speech_dispatcher_0_9 = ["text/speech_dispatcher_0_9"]

[package]
name = "cacophony"
version = "0.2.3"
version = "0.2.4"
authors = ["Esther Alter <subalterngames@gmail.com>"]
description = "A minimalist and ergonomic MIDI sequencer"
documentation = "https://github.com/subalterngames/cacophony"
Expand Down Expand Up @@ -122,7 +122,7 @@ path = "text"
name = "Cacophony"
identifier = "com.subalterngames.cacophony"
icon = ["icon/32.png", "icon/64.png", "icon/128.png", "icon/256.png"]
version = "0.2.3"
version = "0.2.4"
resources = ["data/*"]
copyright = "Copyright (c) Subaltern Games LLC 2023. All rights reserved."
short_description = "A minimalist and ergonomic MIDI sequencer."
Expand Down
5 changes: 4 additions & 1 deletion common/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use clap::Parser;
use std::path::PathBuf;

/// Command-line arguments.
#[derive(Parser)]
#[derive(Parser, Debug)]
#[command(author, version, about)]
pub struct Args {
/// Open the project from disk.
Expand All @@ -26,4 +26,7 @@ pub struct Args {
/// This is meant to be used for debugging.
#[arg(short, long)]
pub events: Option<PathBuf>,
/// If included, immediately quit. This is useful for debugging.
#[arg(short, long)]
pub quit: bool
}
4 changes: 2 additions & 2 deletions data/text.csv
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ PIANO_ROLL_PANEL_INPUT_TTS_TIME_7,\0 to set the playback time to the cursor.
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_SINGLE_TRACK_0,"\0, \1, \2, and \3 to move the view."
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_SINGLE_TRACK_1,\0 and \1 to set the view to the start and end.
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_SINGLE_TRACk_2,\0 and \1 to zoom in and out.
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_SINGLE_TRACK_3,\0 to reset the zoom level."
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_SINGLE_TRACK_3,\0 to reset the zoom level.
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_MULTI_TRACK_0,\0 and \1 to move the view.
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_MULTI_TRACK_1,\0 and \1 to set the view to the start and end."
PIANO_ROLL_PANEL_INPUT_TTS_VIEW_MULTI_TRACK_1,\0 and \1 to set the view to the start and end.
PIANO_ROLL_MODE_TIME,Time
PIANO_ROLL_MODE_VIEW,View
PIANO_ROLL_MODE_SELECT,Select
Expand Down
5 changes: 5 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ async fn main() {
// Parse and load the command line arguments.
let args = Args::parse();

// Immediately quit.
if args.quit {
return;
}

// Get the paths, initialized in loading the window configuration.
let paths = Paths::get();

Expand Down

0 comments on commit e53ebd3

Please sign in to comment.