Skip to content

Commit

Permalink
Merge branch 'main' into bump_dependency_versions
Browse files Browse the repository at this point in the history
  • Loading branch information
alters-mit committed Jun 17, 2024
2 parents 64403ba + 585a030 commit 2a11af8
Show file tree
Hide file tree
Showing 10 changed files with 507 additions and 65 deletions.
12 changes: 8 additions & 4 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 Expand Up @@ -33,7 +35,7 @@ jobs:

# Install the required dependencies
- name: Install test dependencies
run: sudo apt-get install clang cmake speech-dispatcher libspeechd-dev pkg-config libssl-dev alsa librust-alsa-sys-dev
run: sudo apt install clang cmake speech-dispatcher libspeechd-dev pkg-config libssl-dev alsa librust-alsa-sys-dev -y

# Cargo fmt
- uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -66,12 +68,14 @@ jobs:

# Install the required dependencies on Ubuntu
- name: Install test dependencies
run: sudo apt-get install clang cmake speech-dispatcher libspeechd-dev pkg-config libssl-dev alsa librust-alsa-sys-dev
run: sudo apt install clang cmake speech-dispatcher libspeechd-dev pkg-config libssl-dev alsa librust-alsa-sys-dev -y
if: ${{ contains(matrix.os, 'ubuntu') }}

# Test for Ubuntu 20.04
# Test for Ubuntu 20.04. Copy a valid speechd.conf file and then test.
- name: Test
run: cargo test --all --features speech_dispatcher_0_9
run: |
sudo cp test_files/ubuntu20.04/speechd.conf /etc/speech-dispatcher/speechd.conf
cargo test --all --features speech_dispatcher_0_9
if: matrix.os == 'ubuntu-20.04'

# Test for Ubuntu 22.04
Expand Down
118 changes: 69 additions & 49 deletions Cargo.lock

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

8 changes: 4 additions & 4 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.4"
version = "0.2.5"
authors = ["Esther Alter <subalterngames@gmail.com>"]
description = "A minimalist and ergonomic MIDI sequencer"
documentation = "https://github.com/subalterngames/cacophony"
Expand Down Expand Up @@ -48,7 +48,7 @@ default-features = false
features = []

[workspace.dependencies.ureq]
version = "2.8.0"
version = "2.9.7"
default-features = false
features = ["tls"]

Expand Down Expand Up @@ -84,7 +84,7 @@ speech_dispatcher_0_9 = ["text/speech_dispatcher_0_9"]

[package]
name = "cacophony"
version = "0.2.4"
version = "0.2.5"
authors = ["Esther Alter <subalterngames@gmail.com>"]
description = "A minimalist and ergonomic MIDI sequencer"
documentation = "https://github.com/subalterngames/cacophony"
Expand Down Expand Up @@ -120,7 +120,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.4"
version = "0.2.5"
resources = ["data/*"]
copyright = "Copyright (c) Subaltern Games LLC 2023. All rights reserved."
short_description = "A minimalist and ergonomic MIDI sequencer."
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# 0.2.x

## 0.2.5

- Fixed: Crash if a Channel Pressure or Program Change message is sent from a MIDI controller.
- (Backend) Added some more tests
- (Backend) Bumped ureq version (fixes a security warning)
- (Backend) Added tests for TTS

## 0.2.4

- Fixed: If note is played via a qwerty key press, and then an octave is changed via a qwerty key press, there won't be a note-off event.
Expand Down
2 changes: 1 addition & 1 deletion common/src/open_file/child_paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ mod tests {
Some(ch) => ch != '.',
None => false,
});
assert_eq!(child_paths.children.len(), 14);
assert!(child_paths.children.len() > 0);
assert!(child_paths.selected.is_some());
assert_eq!(child_paths.selected.unwrap(), 0);
// Go "up" a directory.
Expand Down
Loading

0 comments on commit 2a11af8

Please sign in to comment.