diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index c4f93f132..43732d34c 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -13,7 +13,7 @@ jobs: go-lint: name: Lint Go code runs-on: ubuntu-latest - container: deluan/ci-goreleaser:1.22.3-1 + container: deluan/ci-goreleaser:1.23.0-1 steps: - uses: actions/checkout@v4 @@ -44,7 +44,7 @@ jobs: go: name: Test Go code runs-on: ubuntu-latest - container: deluan/ci-goreleaser:1.22.3-1 + container: deluan/ci-goreleaser:1.23.0-1 steps: - name: Check out code into the Go module directory uses: actions/checkout@v4 @@ -104,7 +104,7 @@ jobs: name: Build binaries needs: [js, go, go-lint] runs-on: ubuntu-latest - container: deluan/ci-goreleaser:1.22.3-1 + container: deluan/ci-goreleaser:1.23.0-1 steps: - name: Checkout Code uses: actions/checkout@v4 diff --git a/.goreleaser.yml b/.goreleaser.yml index 28f00c749..09d638067 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,5 +1,6 @@ # GoReleaser config project_name: navidrome +version: 2 builds: - id: navidrome_linux_amd64 @@ -121,7 +122,7 @@ checksum: name_template: "{{ .ProjectName }}_checksums.txt" snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" + version_template: "{{ .Tag }}-SNAPSHOT" release: draft: true diff --git a/Makefile b/Makefile index 54724aa0f..481d06fd1 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ GIT_SHA=source_archive GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD))) endif -CI_RELEASER_VERSION=1.22.3-1 ## https://github.com/navidrome/ci-goreleaser +CI_RELEASER_VERSION=1.23.0-1 ## https://github.com/navidrome/ci-goreleaser UI_SRC_FILES := $(shell find ui -type f -not -path "ui/build/*" -not -path "ui/node_modules/*") diff --git a/scanner/metadata/taglib/taglib_test.go b/scanner/metadata/taglib/taglib_test.go index 69ab25750..96819229e 100644 --- a/scanner/metadata/taglib/taglib_test.go +++ b/scanner/metadata/taglib/taglib_test.go @@ -95,10 +95,10 @@ var _ = Describe("Extractor", func() { m := mds[file] - Expect(m).To(HaveKeyWithValue("replaygain_album_gain", []string{albumGain})) - Expect(m).To(HaveKeyWithValue("replaygain_album_peak", []string{albumPeak})) - Expect(m).To(HaveKeyWithValue("replaygain_track_gain", []string{trackGain})) - Expect(m).To(HaveKeyWithValue("replaygain_track_peak", []string{trackPeak})) + Expect(m["replaygain_album_gain"]).To(ContainElement(albumGain)) + Expect(m["replaygain_album_peak"]).To(ContainElement(albumPeak)) + Expect(m["replaygain_track_gain"]).To(ContainElement(trackGain)) + Expect(m["replaygain_track_peak"]).To(ContainElement(trackPeak)) Expect(m).To(HaveKeyWithValue("title", []string{"Title", "Title"})) Expect(m).To(HaveKeyWithValue("album", []string{"Album", "Album"})) diff --git a/scanner/metadata/taglib/taglib_wrapper.go b/scanner/metadata/taglib/taglib_wrapper.go index 067710f99..888c6ac8c 100644 --- a/scanner/metadata/taglib/taglib_wrapper.go +++ b/scanner/metadata/taglib/taglib_wrapper.go @@ -4,6 +4,7 @@ package taglib #cgo pkg-config: taglib #cgo illumos LDFLAGS: -lstdc++ -lsendfile #cgo linux darwin CXXFLAGS: -std=c++11 +#cgo darwin LDFLAGS: -L/opt/homebrew/opt/taglib/lib #include #include #include