From 2c24ed64955a16ac8db35487b5dc91cd0e8f1bf9 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 16 Mar 2023 10:40:14 +0600 Subject: [PATCH 1/4] cd: use versioned file name for spotube tar.xz binary --- .github/workflows/spotube-release-binary.yml | 33 ++++++++++++-------- Makefile | 2 +- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml index 9a89e0f0..0d6c22a3 100644 --- a/.github/workflows/spotube-release-binary.yml +++ b/.github/workflows/spotube-release-binary.yml @@ -29,7 +29,7 @@ jobs: with: cache: true - - name: Replace pubspec version (nightly) + - name: Replace pubspec version and BUILD_VERSION Env (nightly) if: ${{ inputs.channel == 'nightly' }} run: | choco install sed make yq -y @@ -37,7 +37,7 @@ jobs: yq -i '.version += strenv(GITHUB_RUN_NUMBER)' pubspec.yaml "BUILD_VERSION=${{ inputs.version }}+${{ inputs.channel }}.${{ github.run_number }}" >> $env:GITHUB_ENV - - name: Replace pubspec version (stable) + - name: BUILD_VERSION Env (stable) if: ${{ inputs.channel == 'stable' }} run: | "BUILD_VERSION=${{ inputs.version }}" >> $env:GITHUB_ENV @@ -107,7 +107,7 @@ jobs: chmod +x appimagetool mv appimagetool /usr/local/bin/ - - name: Replace pubspec version (nightly) + - name: Replace pubspec version and BUILD_VERSION Env (nightly) if: ${{ inputs.channel == 'nightly' }} run: | curl -sS https://webi.sh/yq | sh @@ -115,7 +115,7 @@ jobs: yq -i '.version += strenv(GITHUB_RUN_NUMBER)' pubspec.yaml echo "BUILD_VERSION=${{ inputs.version }}+${{ inputs.channel }}.${{ github.run_number }}" >> $GITHUB_ENV - - name: Replace pubspec version (stable) + - name: BUILD_VERSION Env (stable) if: ${{ inputs.channel == 'stable' }} run: | echo "BUILD_VERSION=${{ inputs.version }}" >> $GITHUB_ENV @@ -142,11 +142,18 @@ jobs: run: | dart pub global activate flutter_distributor flutter_distributor package --platform=linux --targets=deb,appimage,rpm --skip-clean - make tar + + - name: Create tar.xz (stable) + if: ${{ inputs.channel == 'stable' }} + run: make tar VERSION=${{ env.BUILD_VERSION }} + + - name: Create tar.xz (nightly) + if: ${{ inputs.channel == 'nightly' }} + run: make tar VERSION=nightly - name: Move Files to dist run: | - mv build/Spotube-linux-x86_64.tar.xz dist/ + mv build/spotube-linux-*-x86_64.tar.xz dist/ mv dist/**/spotube-*-linux.deb dist/Spotube-linux-x86_64.deb mv dist/**/spotube-*-linux.rpm dist/Spotube-linux-x86_64.rpm mv dist/**/spotube-*-linux.AppImage dist/Spotube-linux-x86_64.AppImage @@ -169,7 +176,7 @@ jobs: sudo apt-get update -y sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev make python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse - - name: Replace pubspec version (nightly) + - name: Replace pubspec version and BUILD_VERSION Env (nightly) if: ${{ inputs.channel == 'nightly' }} run: | curl -sS https://webi.sh/yq | sh @@ -177,7 +184,7 @@ jobs: yq -i '.version += strenv(GITHUB_RUN_NUMBER)' pubspec.yaml echo "BUILD_VERSION=${{ inputs.version }}+${{ inputs.channel }}.${{ github.run_number }}" >> $GITHUB_ENV - - name: Replace pubspec version (stable) + - name: BUILD_VERSION Env (stable) if: ${{ inputs.channel == 'stable' }} run: | echo "BUILD_VERSION=${{ inputs.version }}" >> $GITHUB_ENV @@ -219,7 +226,7 @@ jobs: with: cache: true - - name: Replace pubspec version (nightly) + - name: Replace pubspec version and BUILD_VERSION Env (nightly) if: ${{ inputs.channel == 'nightly' }} run: | brew install yq @@ -227,7 +234,7 @@ jobs: yq -i '.version += strenv(GITHUB_RUN_NUMBER)' pubspec.yaml echo "BUILD_VERSION=${{ inputs.version }}+${{ inputs.channel }}.${{ github.run_number }}" >> $GITHUB_ENV - - name: Replace pubspec version (stable) + - name: BUILD_VERSION Env (stable) if: ${{ inputs.channel == 'stable' }} run: | echo "BUILD_VERSION=${{ inputs.version }}" >> $GITHUB_ENV @@ -282,9 +289,9 @@ jobs: - name: Generate Checksums run: | tree . - md5sum ./Spotube-Release-Binaries/* >> RELEASE.md5sum - sha256sum ./Spotube-Release-Binaries/* >> RELEASE.sha256sum - sed -i 's|./Spotube-Release-Binaries/||' RELEASE.sha256sum RELEASE.md5sum + md5sum Spotube-Release-Binaries/* >> RELEASE.md5sum + sha256sum Spotube-Release-Binaries/* >> RELEASE.sha256sum + sed -i 's|Spotube-Release-Binaries/||' RELEASE.sha256sum RELEASE.md5sum - uses: actions/upload-artifact@v3 with: diff --git a/Makefile b/Makefile index b7e8029d..985d4486 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ tar: && cp linux/spotube.desktop $(TEMP_DIR)\ && cp assets/spotube-logo.png $(TEMP_DIR)\ && cp linux/com.github.KRTirtho.Spotube.appdata.xml $(TEMP_DIR)\ - && tar -cJf build/Spotube-linux-x86_64.tar.xz -C $(TEMP_DIR) .\ + && tar -cJf build/spotube-linux-${VERSION}-x86_64.tar.xz -C $(TEMP_DIR) .\ && rm -rf $(TEMP_DIR) appimage: From fb493cfd730ed86e07839a3cc5e2ee0f2a0ea7b6 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 16 Mar 2023 10:46:14 +0600 Subject: [PATCH 2/4] chore: add @RaptaG as contributor in README and update PKGBUILD --- README.md | 5 +++-- aur-struct/PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 00ff51c3..c9395a27 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@

- - GitHub Workflow Status + + GitHub Workflow Status GitHub release @@ -206,6 +206,7 @@ But why? You can learn about it [here](https://dev.to/krtirtho/choosing-open-sou - [Kingkor Roy Tirtho](https://github.com/KRTirtho) - The Founder, Maintainer and Lead Developer - [Owen Conor](https://github.com/owencz1998) - The Cool Discord Moderator - [Piotr Rogowski](https://github.com/karniv00l) - The MacOS Developer +- [RaptaG](https://github.com/raptag) - The Github Moderator and Community Manager - [Rusty Apple](https://github.com/RustyApple) - The Mysterious Unknown Guy # Social platforms diff --git a/aur-struct/PKGBUILD b/aur-struct/PKGBUILD index 20a29b95..02c08ce2 100644 --- a/aur-struct/PKGBUILD +++ b/aur-struct/PKGBUILD @@ -19,7 +19,7 @@ backup=() options=() install= changelog= -source=("https://github.com/KRTirtho/spotube/releases/download/v${pkgver}/Spotube-linux-x86_64.tar.xz") +source=("https://github.com/KRTirtho/spotube/releases/download/v${pkgver}/spotube-linux-${pkgver}-x86_64.tar.xz") noextract=() md5sums=(%{{LINUX_MD5}}%) validpgpkeys=() From 27ef3cf11d272d336deed75770ddbdc6c86a4bb8 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 16 Mar 2023 11:04:52 +0600 Subject: [PATCH 3/4] chore: update descriptions and features across publishable files --- aur-struct/.SRCINFO | 2 +- aur-struct/PKGBUILD | 2 +- choco-struct/spotube.nuspec | 20 +++++++++++--------- metadata/en-US/full_description.txt | 20 ++++++++++---------- pubspec.yaml | 4 +--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/aur-struct/.SRCINFO b/aur-struct/.SRCINFO index f94159ca..0b59d626 100644 --- a/aur-struct/.SRCINFO +++ b/aur-struct/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = spotube-bin - pkgdesc = A lightweight free Spotify crossplatform-client which handles playback manually, streams music using Youtube & no Spotify premium account is needed + pkgdesc = Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop & mobile! pkgver = 2.3.0 pkgrel = 1 url = https://github.com/KRTirtho/spotube/ diff --git a/aur-struct/PKGBUILD b/aur-struct/PKGBUILD index 02c08ce2..651a7e72 100644 --- a/aur-struct/PKGBUILD +++ b/aur-struct/PKGBUILD @@ -3,7 +3,7 @@ pkgname=spotube-bin pkgver=%{{SPOTUBE_VERSION}}% pkgrel=%{{PKGREL}}% epoch= -pkgdesc="A lightweight free Spotify crossplatform-client which handles playback manually, streams music using Youtube & no Spotify premium account is needed" +pkgdesc="Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop & mobile!" arch=(x86_64) url="https://github.com/KRTirtho/spotube/" license=('BSD-4-Clause') diff --git a/choco-struct/spotube.nuspec b/choco-struct/spotube.nuspec index 0f09c391..1cef4354 100644 --- a/choco-struct/spotube.nuspec +++ b/choco-struct/spotube.nuspec @@ -22,22 +22,24 @@ https://github.com/KRTirtho/spotube#readme https://github.com/KRTirtho/spotube/issues/new spotube music audio spotify youtube flutter -

A lightweight free Spotify 🎧 crossplatform-client 🖥📱 which handles playback manually, streams music using Youtube & no Spotify premium account is needed 😱 + 🎧 Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop & mobile! Spotube is a Flutter based lightweight spotify client. It utilizes the power of Spotify & Youtube's public API & creates a hazardless, performant & resource friendly User Experience # Features - - Open Source - - No telementry, diagnostics or user data collection - - Lightweight & resource friendly + - Open source/libre software + - Anonymous/guest login + - Cross platform support + - No telemetry, diagnostics or user data collection + - Lightweight & resource-friendly - Native performance (Thanks to Flutter+Skia) - - Playback control is on user's machine instead of server based - - Small size & less data hungry - - No spotify or youtube ads since it uses all public & free APIs (But it's recommended to support the creators by watching/liking/subscribing to the artists youtube channel or add as favourite track in spotify. Mostly buying spotify premium is the best way to support their valuable creations) - - Lyrics - - Downloadable track (WIP) + - Playback control is done locally instead of on the server + - Small size & less data usage + - No Spotify or YouTube ads since it uses all public & free APIs (It is still recommended to support the creators by watching/liking/subscribing to the artists' YouTube channels or liking their tracks on Spotify. Purchasing Spotify Premium is usually the best way to support their valuable creations.) + - Time synced lyrics + - Downloadable tracks https://github.com/KRTirtho/spotube/releases/tag/v%{{SPOTUBE_VERSION}}% diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt index 353eb3a5..db8cd81c 100644 --- a/metadata/en-US/full_description.txt +++ b/metadata/en-US/full_description.txt @@ -1,15 +1,15 @@ -A lightweight free Spotify crossplatform-client (desktop: Mac, Linux, Windows, mobile: Android) which handles playback manually, streams music using Youtube & no Spotify premium account is needed +Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop & mobile! Features: -* Open Source -* Anonymous/Guest Login -* Cross platform +* Open source/libre software +* Anonymous/guest login +* Cross platform support * No telemetry, diagnostics or user data collection -* Lightweight & resource friendly +* Lightweight & resource-friendly * Native performance (Thanks to Flutter+Skia) -* Playback control is on user's machine instead of server based -* Small size & less data hungry -* No spotify or youtube ads since it uses all public & free APIs (But it's recommended to support the creators by watching/liking/subscribing to the artists youtube channel or add as favourite track in spotify. Mostly buying spotify premium is the best way to support their valuable creations) -* Synced Lyrics -* Downloadable track +* Playback control is done locally instead of on the server +* Small size & less data usage +* No Spotify or YouTube ads since it uses all public & free APIs (It is still recommended to support the creators by watching/liking/subscribing to the artists' YouTube channels or liking their tracks on Spotify. Purchasing Spotify Premium is usually the best way to support their valuable creations.) +* Time synced lyrics +* Downloadable tracks diff --git a/pubspec.yaml b/pubspec.yaml index 45aa69c0..2751e347 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,5 @@ name: spotube -description: A lightweight free Spotify crossplatform-client which handles - playback manually, streams music using Youtube & no Spotify premium account is - needed +description: Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop & mobile! publish_to: "none" From 6290a71194d0d209eacec5bb519eeb6ab297f20e Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 16 Mar 2023 11:09:21 +0600 Subject: [PATCH 4/4] docs: update linux tarball path --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9395a27..f7031453 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ Follow me on [Twitter](https://twitter.com/@krtirtho), or join our amazing [Disc [win32-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-windows-x86_64-setup.exe [deb-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-linux-x86_64.deb [rpm-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-linux-x86_64.rpm -[linux-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-linux-x86_64.tar.xz +[linux-dlink]: https://github.com/KRTirtho/spotube/releases/latest [appimage-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-linux-x86_64.AppImage [mac-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-macos-x86_64.dmg [android-dlink]: https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-android-all-arch.apk