Merge branch 'master' into dev

2025-09-13 07:55:18 +00:00 · 2023-03-16 11:10:04 +06:00 · 2023-03-16 11:10:04 +06:00 · 00f527ea5e
commit 00f527ea5e
parent a445d96702 6290a71194
6 changed files with 45 additions and 35 deletions
--- 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:
--- a/2
+++ b/2
@ -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:
--- a/README.md
+++ b/README.md
@ -5,8 +5,8 @@
 </p>

 <p align="center">
-  <a href="https://github.com/KRTirtho/spotube/actions/workflows/spotube-nightly.yml">
-    <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/KRTirtho/spotube/spotube-nightly.yml?color=1585be&style=flat-square">
+  <a href="https://github.com/KRTirtho/spotube/actions/workflows/spotube-release-binary.yml">
+    <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/KRTirtho/spotube/spotube-release-binary.yml?color=1585be&style=flat-square">
  </a>
  <a href="https://github.com/KRTirtho/Spotube/releases">
    <img alt="GitHub release" src="https://img.shields.io/github/v/release/KRTirtho/spotube?color=1585be&style=flat-square"/>
@ -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
--- 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=()
--- a/choco-struct/spotube.nuspec
+++ b/choco-struct/spotube.nuspec
@ -22,22 +22,24 @@
    <docsUrl>https://github.com/KRTirtho/spotube#readme</docsUrl>
    <bugTrackerUrl>https://github.com/KRTirtho/spotube/issues/new</bugTrackerUrl>
    <tags>spotube music audio spotify youtube flutter</tags>
-    <summary>Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop &amp; mobile!</summary>
+    <summary>🎧 Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop &amp; mobile! </summary>
    <description>
    Spotube is a Flutter based lightweight spotify client. It utilizes the power 
    of Spotify  &amp; Youtube's public API  &amp; creates a hazardless, performant  &amp; resource
    friendly User Experience

    # Features
-    - Open Source
-    - No telementry, diagnostics or user data collection
-    - Lightweight  &amp; resource friendly
+    - Open source/libre software
+    - Anonymous/guest login
+    - Cross platform support
+    - No telemetry, diagnostics or user data collection
+    - Lightweight &amp; resource-friendly
    - Native performance (Thanks to Flutter+Skia)
-    - Playback control is on user's machine instead of server based
-    - Small size  &amp; less data hungry
-    - No spotify or youtube ads since it uses all public  &amp; 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 &amp; less data usage
+    - No Spotify or YouTube ads since it uses all public &amp; 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
    </description>
    <releaseNotes>https://github.com/KRTirtho/spotube/releases/tag/v%{{SPOTUBE_VERSION}}%</releaseNotes>
  </metadata>
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@ -2,14 +2,14 @@ Open source Spotify client that doesn't require Premium nor uses Electron! Avail


 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