From 78fe1cbab1311bc06483dac152aa73b1442d6567 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 10 Apr 2023 17:00:50 +0600 Subject: [PATCH 1/6] chore: bump version and generate changelogs --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/spotube-publish-binary.yml | 2 +- .github/workflows/spotube-release-binary.yml | 2 +- CHANGELOG.md | 10 ++++++++++ pubspec.yaml | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 6e0f3215..8a480132 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -46,7 +46,7 @@ body: attributes: label: Spotube version description: In which version of Spotube did you encounter this bug? - placeholder: (e.g.) v2.7.0 + placeholder: (e.g.) v2.7.1 - type: dropdown attributes: label: Installation source diff --git a/.github/workflows/spotube-publish-binary.yml b/.github/workflows/spotube-publish-binary.yml index 94150a3e..6062e620 100644 --- a/.github/workflows/spotube-publish-binary.yml +++ b/.github/workflows/spotube-publish-binary.yml @@ -4,7 +4,7 @@ on: inputs: version: description: Version to release (x.x.x) - default: 2.7.0 + default: 2.7.1 required: true dry_run: description: Dry run diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml index 0d6c22a3..8b165511 100644 --- a/.github/workflows/spotube-release-binary.yml +++ b/.github/workflows/spotube-release-binary.yml @@ -4,7 +4,7 @@ on: inputs: version: description: Version to release (x.x.x) - default: 2.7.0 + default: 2.7.1 required: true channel: type: choice diff --git a/CHANGELOG.md b/CHANGELOG.md index f96a52b0..8aee5918 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.7.1](https://github.com/KRTirtho/spotube/compare/v2.7.0...v2.7.1) (2023-04-10) + + +### Bug Fixes + +* fallback for lyrics when anonymous ([f160ec7](https://github.com/KRTirtho/spotube/commit/f160ec767d9941d33f83aba1752b28df629d0e10)) +* **android:** audio notification stuck in play state ([448c9b3](https://github.com/KRTirtho/spotube/commit/448c9b39f407668ad92a695afe3c9741baeca20d)) +* **macos:** crashing on startup ([c46b428](https://github.com/KRTirtho/spotube/commit/c46b4284b1d46a614cbcebc8c2f2e52714921b9b)) +* spotify query hooks overriding default query params ([ec9a02e](https://github.com/KRTirtho/spotube/commit/ec9a02e8b8d988e15ed58027054d2a9090d98873)) + ## [2.7.0](https://github.com/KRTirtho/spotube/compare/v2.6.0...v2.7.0) (2023-03-07) diff --git a/pubspec.yaml b/pubspec.yaml index d8548b2f..fd1eb273 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Open source Spotify client that doesn't require Premium nor uses El publish_to: "none" -version: 2.7.0+17 +version: 2.7.1+18 environment: sdk: ">=2.17.0 <3.0.0" From 1c555672f8ccca590993382b8c3759dec0ab3107 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 10 Apr 2023 17:17:01 +0600 Subject: [PATCH 2/6] cd: fix windows mv --- .github/workflows/spotube-release-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml index 8b165511..8d649248 100644 --- a/.github/workflows/spotube-release-binary.yml +++ b/.github/workflows/spotube-release-binary.yml @@ -68,7 +68,7 @@ jobs: dart pub global activate flutter_distributor make innoinstall flutter_distributor package --platform=windows --targets=exe --skip-clean - mv dist/**/spotube-*-windows.exe dist/Spotube-windows-x86_64-setup.exe + mv dist/**/spotube-*-windows-setup.exe dist/Spotube-windows-x86_64-setup.exe - name: Create Chocolatey Package and set hash if: ${{ inputs.channel == 'stable' }} From 42d1db64db77a3766ab5b01f0e59611e51a03aae Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 10 Apr 2023 17:33:01 +0600 Subject: [PATCH 3/6] cd: separately package linux packages due to wrong RPATH causing deb and tar to fail --- .github/workflows/spotube-release-binary.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml index 8d649248..92e88f60 100644 --- a/.github/workflows/spotube-release-binary.yml +++ b/.github/workflows/spotube-release-binary.yml @@ -141,7 +141,10 @@ jobs: - name: Build Linux Packages run: | dart pub global activate flutter_distributor - flutter_distributor package --platform=linux --targets=deb,appimage,rpm --skip-clean + alias dpkg-deb="dpkg-deb --Zxz" + flutter_distributor package --platform=linux --targets=appimage + flutter_distributor package --platform=linux --targets=rpm + flutter_distributor package --platform=linux --targets=deb - name: Create tar.xz (stable) if: ${{ inputs.channel == 'stable' }} From 66342644a6ae0fbad039d2de0047f1caebcb7459 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 10 Apr 2023 17:50:50 +0600 Subject: [PATCH 4/6] cd(aur): fix tar file name --- .github/workflows/spotube-publish-binary.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spotube-publish-binary.yml b/.github/workflows/spotube-publish-binary.yml index 6062e620..d9b1a3a0 100644 --- a/.github/workflows/spotube-publish-binary.yml +++ b/.github/workflows/spotube-publish-binary.yml @@ -48,14 +48,14 @@ jobs: - uses: dsaltares/fetch-gh-release-asset@master with: version: tags/v${{ inputs.version }} # mind the "v" prefix - file: Spotube-linux-x86_64.tar.xz + file: spotube-linux-${{inputs.version}}-x86_64.tar.xz token: ${{ secrets.GITHUB_TOKEN }} - name: Update PKGBUILD versions run: | sed -i "s/%{{SPOTUBE_VERSION}}%/${{ inputs.version }}/" aur-struct/PKGBUILD sed -i "s/%{{PKGREL}}%/1/" aur-struct/PKGBUILD - sed -i "s/%{{LINUX_MD5}}%/`md5sum Spotube-linux-x86_64.tar.xz | awk '{print $1}'`/" aur-struct/PKGBUILD + sed -i "s/%{{LINUX_MD5}}%/`md5sum spotube-linux-${{inputs.version}}-x86_64.tar.xz | awk '{print $1}'`/" aur-struct/PKGBUILD - name: Release to AUR if: ${{ !inputs.dry_run }} From 1f9c02cc1efb16e6bab649a879e33afae42e1b29 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 10 Apr 2023 17:53:40 +0600 Subject: [PATCH 5/6] cd(publish): ability to select specific jobs --- .github/workflows/spotube-publish-binary.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/spotube-publish-binary.yml b/.github/workflows/spotube-publish-binary.yml index d9b1a3a0..487befbd 100644 --- a/.github/workflows/spotube-publish-binary.yml +++ b/.github/workflows/spotube-publish-binary.yml @@ -11,10 +11,16 @@ on: required: true type: boolean default: true + jobs: + description: Jobs to run + required: true + type: string + default: "flathub,aur,winget,chocolatey" jobs: flathub: runs-on: ubuntu-22.04 + if: contains(inputs.jobs, 'flathub') steps: - uses: actions/checkout@v3 with: @@ -42,6 +48,7 @@ jobs: aur: runs-on: ubuntu-22.04 + if: contains(inputs.jobs, 'aur') steps: - uses: actions/checkout@v3 @@ -70,6 +77,7 @@ jobs: winget: runs-on: windows-latest + if: contains(inputs.jobs, 'winget') steps: - name: Release winget package if: ${{ !inputs.dry_run }} @@ -82,6 +90,7 @@ jobs: chocolatey: runs-on: windows-latest + if: contains(inputs.jobs, 'chocolatey') steps: - uses: dsaltares/fetch-gh-release-asset@master with: From 74d93fc682c1ea7d3235209ab3fd9a4a17e98475 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 10 Apr 2023 20:38:31 +0600 Subject: [PATCH 6/6] cd: fix typos --- .github/workflows/spotube-publish-binary.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spotube-publish-binary.yml b/.github/workflows/spotube-publish-binary.yml index 487befbd..4761080d 100644 --- a/.github/workflows/spotube-publish-binary.yml +++ b/.github/workflows/spotube-publish-binary.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: version: - description: Version to release (x.x.x) + description: Version to publish (x.x.x) default: 2.7.1 required: true dry_run: @@ -12,7 +12,7 @@ on: type: boolean default: true jobs: - description: Jobs to run + description: Jobs to run (flathub,aur,winget,chocolatey) required: true type: string default: "flathub,aur,winget,chocolatey"