Skip to content

Commit

Permalink
Assorted clean-up pre-merge:
Browse files Browse the repository at this point in the history
    - fix the project CI (again)
    - I've decided on a policy of supporting rust versions going back
      six months. At the time of this writing, that's rust 1.70.0.
    - address a corner case when HOME isn not set
    - update GNU files
  • Loading branch information
sp1ff committed Dec 29, 2023
1 parent 303694e commit 92cb1c5
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 35 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@ jobs:
include:
- rust-build: pinned
os: ubuntu-22.04
# 1.56.0 was the first to support 2021 edition
# 1.58 -- required by cargo-deb...
# but it seems a cargo-deb dependency (rayon-core) needs 1.59,
# whereas another (`log1) requires 1.60, and the `cargo-deb`
# README says 1.63. Dependency `toml_edit` needs 1.64!
# ...and dependency `addr2line` now needs 1.65 (2023-08-23)
rust: 1.65
rust: 1.70.0
- rust-build: stable
os: ubuntu-22.04
rust: stable
Expand All @@ -40,7 +34,7 @@ jobs:
rust: nightly
- rust-build: pinned
os: macos-12
rust: 1.65
rust: 1.70.0
- rust-build: stable
os: macos-12
rust: stable
Expand Down
14 changes: 14 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@ mpdpopm News -- history of user-visible changes -*- outline -*-

* 0.3 builds

** 0.3.3 build

*** Bugfixes

**** [#10] Repair setting a sticker for the first time
**** [#9] Correctly quote files with double-quotes in their name
*** User-visible changes

**** If HOME isn't set, look for .mppopm in /
** 0.3.2 build

*** Bugfixes

**** Fix issue #10: mpdpopm now fails to set playcount for the first time
** 0.3.1 build

No user-visible changes; strictly a hygiene build:
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([mpdpopm], [0.3.1], [sp1ff@pobox.com], [mpdpopm], [https://github.com/sp1ff/mpdpopm])
AC_INIT([mpdpopm], [0.3.2], [sp1ff@pobox.com], [mpdpopm], [https://github.com/sp1ff/mpdpopm])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([mpdpopm/Cargo.toml.in])
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability -Wno-override gnits std-options dist-xz dist-zstd])
Expand Down
4 changes: 2 additions & 2 deletions doc/version.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@set UPDATED 29 March 2021
@set UPDATED-MONTH March 2021
@set EDITION 0.3.1
@set VERSION 0.3.1
@set EDITION 0.3.2
@set VERSION 0.3.2
38 changes: 16 additions & 22 deletions mpdpopm/Cargo.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,25 @@ exclude = ["Cargo.toml.in", "Cargo.toml.orig", "Makefile", "Makefile.in", "Makef
lalrpop = { version = "0.20", features = ["lexer"] }

[dependencies]
anstyle = "=1.0.2" # Pin to preserve the ability to build with rust 1.65
anstyle-parse = "=0.2.1" # Pin to preserve the ability to build with rust 1.65
async-trait = "0.1.31"
backtrace = "0.3.46"
boolinator = "2.4.0"
chrono = "0.4.19"
clap = "=4.3.9" # Pin to preserve the ability to build with rust 1.65
clap_lex = "=0.5.0" # Pin to preserve the ability to build with rust 1.65
errno = "0.2.6"
futures = "0.3.19"
async-trait = "0.1"
backtrace = "0.3"
boolinator = "2.4"
chrono = "0.4"
clap = "4.4" # Pin to preserve the ability to build with rust 1.65
errno = "0.2"
futures = "0.3"
lalrpop-util = { version = "0.20", features = ["lexer"] }
lazy_static = "1.4.0"
libc = "0.2.74"
log = "0.4.8"
log4rs = "0.10.0"
os_str_bytes = "2.3.1"
pin-project = "1.0.8"
regex = "1.3.6"
lazy_static = "1.4"
libc = "0.2"
log = "0.4"
log4rs = "0.10"
os_str_bytes = "2.3"
pin-project = "1.0"
regex = "1.3"
serde = { version = "1.0", features = ["derive"] }
serde_spanned = "=0.6.3" # Pin to preserve the ability to build with rust 1.65
serde-lexpr = "0.1.1"
toml = "=0.7.6" # Pin to preserve the ability to build with rust 1.65
toml_datetime = "=0.6.3" # Pin to preserve the ability to build with rust 1.65
toml_edit = "=0.19.12" # Pin to preserve the ability to build with rust 1.65
tokio = { version = "1.15.0", features = ["io-util", "macros", "net", "process", "rt-multi-thread", "signal", "time"] }
toml = "0.8" # Pin to preserve the ability to build with rust 1.65
tokio = { version = "1.35", features = ["io-util", "macros", "net", "process", "rt-multi-thread", "signal", "time"] }

[package.metadata.deb]
maintainer = "@PACKAGE_AUTHOR@"
Expand Down
6 changes: 5 additions & 1 deletion mpdpopm/src/bin/mppopm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,12 @@ will add all songs whose artist tag matches the regexp \"pogues\" with a rating
}

lazy_static! {
static ref DEF_CFG: String = format!("{}/.mppopm", std::env::var("HOME").unwrap());
static ref DEF_CFG: String = format!(
"{}/.mppopm",
std::env::var("HOME").unwrap_or("".to_string())
);
}

////////////////////////////////////////////////////////////////////////////////////////////////////
// The Big Kahuna //
////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
3 changes: 2 additions & 1 deletion mpdpopm/src/bin/mppopmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ fn daemonize() -> Result {

// We next change the present working directory to avoid keeping the present one in
// use. `mppopmd' can run pretty much anywhere, so /tmp is as good a place as any.
std::env::set_current_dir("/tmp").unwrap();
std::env::set_current_dir("/tmp").unwrap(); // A little unhappy about hard-coding that, but
// if /tmp doesn't exist I expect few things will work.

umask(0);

Expand Down

0 comments on commit 92cb1c5

Please sign in to comment.