diff --git a/Jenkinsfile b/Jenkinsfile index 01bbeb3..7e43df9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -119,6 +119,8 @@ pipeline { steps { sh ''' set -eu + pkg-config --exists alsa libpulse libudev dbus-1 + command -v dbus-run-session cargo check --workspace --all-targets --locked cargo check --workspace --all-targets --no-default-features --locked cargo check --workspace --all-targets --all-features --locked @@ -134,6 +136,7 @@ pipeline { cargo test --workspace --all-targets --locked cargo test --workspace --all-targets --no-default-features --locked cargo test --workspace --all-targets --all-features --locked + dbus-run-session -- cargo test -p fader_master private_bus --locked -- --ignored : >"coverage/.tests-passed-${BUILD_NUMBER}" ''' } @@ -145,18 +148,18 @@ pipeline { sh ''' set -eu - cargo check -p fader-core -p fader-config -p midi -p volume_lib -p tui \ + cargo check -p fader-core -p fader-config -p midi -p volume_lib -p tui -p media \ --all-targets --no-default-features --locked - cargo test -p fader-core -p fader-config -p midi -p volume_lib -p tui \ + cargo test -p fader-core -p fader-config -p midi -p volume_lib -p tui -p media \ --all-targets --no-default-features --locked - cargo test -p fader-core -p fader-config -p midi -p volume_lib -p tui \ + cargo test -p fader-core -p fader-config -p midi -p volume_lib -p tui -p media \ --doc --no-default-features --locked RUSTDOCFLAGS='-D warnings' \ - cargo doc -p fader-core -p fader-config -p midi -p volume_lib -p tui \ + cargo doc -p fader-core -p fader-config -p midi -p volume_lib -p tui -p media \ --no-deps --no-default-features --locked - cargo clippy -p fader-core -p fader-config -p midi -p volume_lib -p tui \ + cargo clippy -p fader-core -p fader-config -p midi -p volume_lib -p tui -p media \ --all-targets --no-default-features --locked -- -D warnings - cargo build -p fader-core -p fader-config -p midi -p volume_lib -p tui \ + cargo build -p fader-core -p fader-config -p midi -p volume_lib -p tui -p media \ --release --no-default-features --locked : >"coverage/.tests-passed-${BUILD_NUMBER}" diff --git a/scripts/test-ci.sh b/scripts/test-ci.sh index 6a72823..094d804 100755 --- a/scripts/test-ci.sh +++ b/scripts/test-ci.sh @@ -13,7 +13,7 @@ fail() { assert_contains() { file=$1 expected=$2 - grep -F "$expected" "$file" >/dev/null || fail "$file does not contain: $expected" + grep -F -- "$expected" "$file" >/dev/null || fail "$file does not contain: $expected" } assert_fails() { @@ -37,6 +37,9 @@ assert_contains "$repository/Jenkinsfile" "stage('Portable Rust Gates')" assert_contains "$repository/Jenkinsfile" '!params.ENABLE_NATIVE_BACKENDS' assert_contains "$repository/Jenkinsfile" 'params.ENABLE_NATIVE_BACKENDS' assert_contains "$repository/Jenkinsfile" 'cargo test -p fader-core -p fader-config -p midi -p volume_lib -p tui' +assert_contains "$repository/Jenkinsfile" 'dbus-run-session -- cargo test -p fader_master private_bus --locked -- --ignored' +assert_contains "$repository/Jenkinsfile" 'pkg-config --exists alsa libpulse libudev dbus-1' +assert_contains "$repository/Jenkinsfile" '-p tui -p media' svg_count() { directory=$1